Index: /applications/editors/josm/i18n/po/ar.po
===================================================================
--- /applications/editors/josm/i18n/po/ar.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/ar.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 20:36+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:14+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
 "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1185,5 +1185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "غير قادر على تحريك الأغراض إلى خارج الدنيا"
@@ -1496,5 +1496,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2240,9 +2240,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2323,26 +2323,26 @@
 msgstr "إنهي الرسم."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "أنشئ مساحات"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2360,6 +2360,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2371,9 +2371,9 @@
 msgstr "إختر"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "إختر، حرّك و دوّر أغراض"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2382,17 +2382,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2402,18 +2402,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
-msgid "Release the mouse button to select the objects in the rectangle."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
-msgid "Release the mouse button to stop rotating."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3130,5 +3130,5 @@
 msgstr "طبّق ؟"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3714,7 +3714,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "الإتصال"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -3899,5 +3898,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "خط سكة حديد"
@@ -5176,5 +5175,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "الكلّ"
@@ -5593,4 +5592,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5681,5 +5685,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "العلاقات"
@@ -5781,14 +5785,14 @@
 msgstr "الخيار: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "أغلق هذه اللوحة. يمكنك إعادة فتحها في شريط الأدوات اليساري."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "أنقر لتكبير/تصغير محتويات اللوحة"
@@ -6118,4 +6122,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6128,10 +6138,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6801,145 +6805,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "الإسم"
@@ -8152,10 +8156,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "النوع"
@@ -8163,5 +8167,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8175,17 +8178,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "مجهول"
@@ -8950,11 +8952,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8971,14 +8975,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr ""
@@ -9511,5 +9515,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr ""
@@ -10572,55 +10576,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11093,5 +11097,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "السيارة"
@@ -11113,16 +11117,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "الدراجة"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11152,12 +11157,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "المشي"
@@ -11855,7 +11860,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "إسم الشارع"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
@@ -14108,6 +14112,7 @@
 msgstr ""
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14198,5 +14203,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "إستيفاء العنوان"
@@ -14383,5 +14388,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14422,19 +14427,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "مباني"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14442,5 +14447,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14453,10 +14458,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14639,5 +14644,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16455,5 +16460,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "النقل المشترك"
@@ -16505,5 +16510,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17074,4 +17079,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "النوع"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17228,4 +17250,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "حصر الإنعطاف"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "حصر الإنعطاف"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17981,5 +18017,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "متعدد الضلوع"
@@ -19249,7 +19285,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19266,5 +19302,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr ""
@@ -19282,4 +19318,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19287,9 +19324,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19317,15 +19353,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19336,11 +19366,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr ""
@@ -19360,15 +19389,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19385,11 +19412,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19410,8 +19437,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19429,11 +19456,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr ""
@@ -19453,6 +19480,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19470,11 +19497,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19494,6 +19521,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19511,11 +19538,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19653,5 +19680,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19660,12 +19687,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19673,13 +19703,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19708,24 +19738,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr ""
@@ -19737,5 +19763,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19749,11 +19775,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19761,10 +19786,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19772,10 +19797,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19783,11 +19808,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19795,10 +19819,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19806,10 +19830,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "غابة/حرش"
@@ -19817,10 +19841,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19828,11 +19852,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19840,10 +19863,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19851,10 +19874,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19862,10 +19885,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19873,10 +19896,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19884,10 +19907,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -19895,10 +19918,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -19906,10 +19929,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -19990,6 +20013,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -19998,5 +20020,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -20004,6 +20026,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr ""
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr ""
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr ""
@@ -20012,15 +20063,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -20028,5 +20079,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20068,28 +20119,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr ""
@@ -20102,10 +20152,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20119,10 +20169,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20146,97 +20196,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20251,10 +20301,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr ""
@@ -20270,10 +20320,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "الدراجة النارية"
@@ -20288,19 +20338,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -20308,20 +20358,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "الإرتفاع الأقصى (أمتار)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20329,5 +20379,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr ""
@@ -20338,5 +20388,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20356,10 +20406,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20381,10 +20431,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20406,10 +20456,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20431,5 +20481,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20444,9 +20494,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20460,9 +20510,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "شارع سكني"
@@ -20492,10 +20542,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20525,5 +20575,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20535,10 +20585,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "حرّر جسر"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "حرّر خندق"
@@ -20546,39 +20596,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr ""
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr ""
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr ""
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr ""
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20587,73 +20608,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr ""
@@ -20662,38 +20651,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20702,5 +20721,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20708,5 +20727,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20714,5 +20733,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20730,11 +20749,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "حرّر طريق للدراجات"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20742,5 +20761,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20748,5 +20767,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20754,5 +20773,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20761,15 +20780,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "حرّر طريق قدم"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "درجات"
@@ -20779,10 +20794,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "تقاطع طرقات سريعة"
@@ -20790,15 +20805,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "حرّر تقاطع طرقات سريعة"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "الرقم"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "الخدمات"
@@ -20806,5 +20821,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "حرّر محطة خدمات"
@@ -20844,17 +20859,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "شركة الإدارة"
@@ -20863,5 +20878,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "إشارة سير"
@@ -20871,5 +20886,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "نوع التقاطع للمشاة"
@@ -20878,27 +20893,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "إشارات_السير"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "جزيرة"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20906,6 +20921,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20914,11 +20929,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20926,30 +20941,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "طير الطوقان"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "نمر"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "إشارة وقوف"
@@ -20957,5 +20972,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "تقاطع مشاة"
@@ -20964,14 +20979,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -20979,33 +20994,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21013,5 +21028,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21019,5 +21034,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "مستديرة صغيرة"
@@ -21028,14 +21043,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "الإتجاه"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "إتجاه عقارب الساعة"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21045,5 +21060,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "حدود المدينة"
@@ -21051,15 +21066,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "الإسم الثاني"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "كاميرا مراقبة السير"
@@ -21068,5 +21083,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "هاتف طوارئ"
@@ -21074,5 +21089,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21080,5 +21095,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21086,5 +21101,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21094,10 +21109,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21105,5 +21120,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr ""
@@ -21111,5 +21126,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -21121,7 +21136,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "إرتفاع"
@@ -21129,5 +21144,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "حواجز"
@@ -21135,5 +21150,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21141,5 +21156,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21184,16 +21199,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "السير المسموح:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "حاجز دراجة"
@@ -21202,5 +21217,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21208,5 +21223,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21214,10 +21229,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21225,15 +21240,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21241,5 +21256,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21247,10 +21262,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "مراقبة الحدود"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "حرّر مراقبة الحدود"
@@ -21260,5 +21275,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21269,22 +21284,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "حائط/جدار"
@@ -21292,5 +21307,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "حائط/جدار مدينة"
@@ -21299,5 +21314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21309,10 +21324,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21320,5 +21335,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr ""
@@ -21326,50 +21341,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21377,25 +21392,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21406,11 +21421,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "الماء"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "نبع"
@@ -21418,5 +21433,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "حرّر نبع"
@@ -21424,5 +21439,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "مسرب"
@@ -21430,10 +21445,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "حرّر مسرب"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21441,10 +21456,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "جدول نهر"
@@ -21452,10 +21467,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "حرّر جدول نهر"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "قناة"
@@ -21463,10 +21478,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "حرّر قناة"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "نهر"
@@ -21476,5 +21491,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "نهر"
@@ -21482,15 +21497,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "حرّر الماء"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "الأرض اليابسة"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "حرّر الأرض اليابسة"
@@ -21498,15 +21513,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "حوض"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "حرّر حوض"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "خزان"
@@ -21514,15 +21529,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "حرّر خزان"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "خزان مغطى"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "حرّر خزان مغطى"
@@ -21530,5 +21545,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "ضفة نهر"
@@ -21537,10 +21552,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "حرّر ضفة نهر"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "أراضي رطبة"
@@ -21551,14 +21566,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "حرّ أراضي رطبة"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "مستنقع"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21572,35 +21587,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "شجر إستوائي"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "وحل"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "حرّر وحل"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "شاطئ بحر"
@@ -21608,20 +21623,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "حرّر شاطئ بحر"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "خليج"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "حرّر خليج"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "منحدر صخري"
@@ -21629,10 +21644,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "حرّر منحدر صخري"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "شاطئ"
@@ -21640,5 +21655,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "حرّر شاطئ"
@@ -21646,5 +21661,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr ""
@@ -21652,5 +21667,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21659,5 +21674,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "حوض سفن"
@@ -21665,10 +21680,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "حرّر حوض سفن"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "مرسى"
@@ -21676,5 +21691,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "حرّر مرسى"
@@ -21682,5 +21697,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "سدّ"
@@ -21688,15 +21703,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "حرّر سدّ"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "نقطة مجرى ماء"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr ""
@@ -21705,5 +21720,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "سدّ (صغير)"
@@ -21711,20 +21726,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "سدّ (صغير)"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "شلال ماء"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "حرّر شلال ماء"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21733,15 +21748,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "مارينا"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "حرّر مارينا"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "رصيف ميناء"
@@ -21749,10 +21764,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "حرّر رصيف ميناء"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21760,10 +21775,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21773,20 +21788,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr "سكة حديدية"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "سكة"
@@ -21794,5 +21809,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "حرّر سكة"
@@ -21822,86 +21837,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21913,8 +21853,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21928,29 +21868,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21963,8 +21903,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22035,8 +21975,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22048,8 +21988,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "التوتر"
@@ -22062,8 +22002,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22076,23 +22016,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "قطار ذات سكة حديد واحدة"
@@ -22100,50 +22040,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "حرّر قطار ذات سكة حديد واحدة"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "قطار نفقي"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "حرّر قطار نفقي"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "ترام"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "حرّر ترام"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22151,5 +22091,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22158,10 +22098,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "سكة حديد غير مستعملة"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "حرّر سكة حديد غير مستعملة"
@@ -22170,9 +22110,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "سكة حديد مهجورة"
@@ -22181,5 +22121,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22188,5 +22128,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22196,5 +22136,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22202,5 +22142,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22209,5 +22149,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22216,10 +22156,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "مصعد كرسي"
@@ -22227,10 +22167,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "حرّر مصعد كرسي"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22238,10 +22178,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22249,10 +22189,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22260,10 +22200,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22272,5 +22212,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22278,5 +22218,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22285,5 +22225,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22291,5 +22231,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "وقود"
@@ -22299,62 +22239,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "حرّر وقود"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22412,32 +22352,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "أزقات الإفتتاح"
@@ -22496,165 +22436,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22671,5 +22611,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22679,5 +22619,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "موقف سيارات"
@@ -22688,25 +22628,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "الرقم المرجعي"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "متعدد الطوابق"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "مساحة"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "تحت الأرض"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22715,48 +22655,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "رسم دخول/إجرة"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "غسيل سيارات"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "حرّر غسيل سيارات"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "تصليح سيارات"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "حرّر تصليح سيارات"
@@ -22764,5 +22704,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "إستئجار سيارة"
@@ -22771,10 +22711,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "حرّر إستئجار سيارة"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "مشاركة السيارة"
@@ -22782,5 +22722,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "حرّر مشاركة السيارة"
@@ -22788,10 +22728,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "حرّر موقف دراجة"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "إستيعاب"
@@ -22800,10 +22740,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "حرر إستأجار دراجة"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22813,5 +22753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22819,5 +22759,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22825,5 +22765,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "موقف قطار"
@@ -22831,5 +22771,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "حرّر موقف"
@@ -22837,5 +22777,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "موقف ترام"
@@ -22844,5 +22784,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "حرر موقف ترام"
@@ -22850,5 +22790,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "رصيف محطة القطار"
@@ -22857,5 +22797,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "حرّر رصيف محطة القطار"
@@ -22867,5 +22807,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22873,10 +22813,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "مساحة"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "مدخل قطار نفقي"
@@ -22885,10 +22825,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "حرّر مدخل قطار نفقي"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "مناسب لكرسي المقعدين"
@@ -22897,5 +22837,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "محطة حافلة نقل جماعي (باص)"
@@ -22904,5 +22844,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "حرّر محطة حافلة نقل جماعي (باص)"
@@ -22910,5 +22850,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "موقف محطة حافلة نقل جماعي"
@@ -22918,5 +22858,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "حرّر موقفحافلة نقل جماعي (باص)"
@@ -22925,6 +22865,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "ملجأ"
@@ -22932,19 +22872,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -22952,5 +22892,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "تاكسي"
@@ -22958,5 +22898,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "حرّر موقف تاكسي"
@@ -22964,10 +22904,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "مطار"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22975,5 +22915,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -22981,10 +22921,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -22993,5 +22933,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -22999,5 +22939,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23005,5 +22945,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23011,5 +22951,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23017,5 +22957,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23023,5 +22963,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23031,5 +22971,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23039,5 +22979,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23048,6 +22988,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "عمود إضائة"
@@ -23057,5 +22997,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23064,5 +23004,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23070,5 +23010,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23076,15 +23016,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "مكان المبيت"
@@ -23096,5 +23036,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "فندق"
@@ -23103,15 +23043,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "حرّر فندق"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "النجوم"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "فندق (رخيص)"
@@ -23119,20 +23059,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "حرّر فندق (رخيص)"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "حرّر بيت ضيافة"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "كوخ"
@@ -23140,10 +23080,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "حرّر كوخ"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "نزل"
@@ -23151,30 +23091,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "حرّر نزل"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "حرّر كوخ جبلي"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "حرّر موقع قافلة"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "موقع تخييم"
@@ -23182,10 +23122,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "حرّر موقع تخييم"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "طعام و شراب"
@@ -23196,5 +23136,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "مطعم"
@@ -23202,5 +23142,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "حرّر مطعم"
@@ -23208,5 +23148,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "الطبخ"
@@ -23214,73 +23154,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "إيطالي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "صيني"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "معجنات إيطالية (بيزا)"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "هامبرغر"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "يوناني"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "ألماني"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "هندي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "محلي/إقليمي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "كباب / شورما"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "تركي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "آسيوي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "تايلاندي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "مكسيكي"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "ياباني"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "وجبات سريعة"
@@ -23288,17 +23228,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "حرّر مطعم وجبات السريعة"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "مقهى إستراحة"
@@ -23306,9 +23246,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "حرّر مقهى إستراحة"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "حانة"
@@ -23316,18 +23256,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "حانة شرب الجعة"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "حرّر حانة شرب الجعة"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "حانة"
@@ -23335,9 +23275,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "حرّر حانة"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "نادي سهر / نادي ليلي"
@@ -23345,24 +23285,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "حرّر نادي سهر/ نادي ليلي"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "سياحة"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "متحف"
@@ -23370,9 +23310,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "حرّر متحف"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "حديقة حيوانات"
@@ -23381,9 +23321,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "حرّر حديقة حيوانات"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "موقع كاشف"
@@ -23391,24 +23331,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "برج مراقبة"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "أعمال فنية"
@@ -23416,5 +23356,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "حرّر أعمال فنية"
@@ -23422,19 +23362,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "مكتب إستعلامات"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "الخريطة"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23472,5 +23412,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23478,28 +23418,28 @@
 msgstr "شارع"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23509,5 +23449,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23515,5 +23455,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23521,6 +23461,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "ركب الدراجة"
@@ -23528,5 +23468,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23534,6 +23474,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "تزلّج"
@@ -23541,5 +23481,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23547,46 +23487,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "لوحة معلومات"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "التاريخ"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "الطبيعة"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "الحيوانات الضارة"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23594,29 +23534,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "حرّر ملجأ"
@@ -23624,25 +23564,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "موقع تنزه"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "حرّر موقع تنزه"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "مواقع تاريخية"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "قلعة"
@@ -23651,19 +23591,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "حرّر قلعة"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "أطلال"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "حرّر أطلال"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "موقع أثري"
@@ -23672,9 +23612,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "حرّر موقع أثري"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "ساحة معركة"
@@ -23682,10 +23622,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "حرّر ساحة معركة"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23693,5 +23633,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23699,15 +23639,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "نصب تذكاري"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "حرّر نصب تذكاري"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "ضريح"
@@ -23715,55 +23655,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "حرّر ضريح"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "ضريح/مزار"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "حرّر مزار/ضريح"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "وقت الفراغ"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "حرّر حديقة ألعاب مائية"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "ملعب"
@@ -23771,35 +23711,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "حرّر ملعب"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "صيد السمك"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "حرّر صيد السمك"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "المرافق الرياضية"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "مدرج ألعاب رياضية"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "حرّر مدرج ألعاب رياضية"
@@ -23813,6 +23753,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "إختر الرياضة :"
@@ -24204,6 +24144,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24237,225 +24177,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "متعدد"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "أسلحة الرماية"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "كرة القدم الأوسترالية"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "كرة المضرب"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "كرة السلّة"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "التسلق"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ركوب الدراجة"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "سبق الكلاب"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ركوب الخيل"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "الجمباز"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "سبق الخيل"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "رياضة المحركات"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "التزلج"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "كرة القدم"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "السباحة"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "تنس الطاولة"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "التنس"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "مركز/نادي  رياضي"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "حرّر مركز/نادي رياضي"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
+#: build/trans_presets.java:1932
+msgid "Golf Course"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1933
+msgid "Edit Golf Course"
+msgstr ""
+
+#: build/trans_presets.java:1938
+msgid "Miniature Golf"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Miniature Golf"
 #: build/trans_presets.java:1939
-msgid "Golf Course"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
-msgid "Edit Golf Course"
+msgid "Edit Miniature Golf"
 msgstr ""
 
 #: build/trans_presets.java:1945
-msgid "Miniature Golf"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
-msgid "Edit Miniature Golf"
-msgstr ""
-
-#: build/trans_presets.java:1952
 msgid "Sport"
 msgstr "رياضة"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "متعدد"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24494,21 +24434,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "النوع"
@@ -24547,203 +24487,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "مركز/نادي رياضي"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "مدرج ألعاب رياضية"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "سلاح الرامي"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "حرّر سلاح الرامي"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "تسلق"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "حرّر تسلق"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "غدف"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "حرّر غدف"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "حرّر ركب الدراجة"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "سباق الكلاب"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "حرّر سباق الكلاب"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "فروسي"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "حرّر فروسي"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "سباق الخيل"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "حرّر سباق الخيل"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "رياضة بدنية"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "حرّر رياضة بدنية"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "رياضة المحركات"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "حرّر رياضة المحركات"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "تزحلق"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "حرّر تزحلق"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "سباحة"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "حرّر سباحة"
@@ -24751,52 +24691,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "حرّر تزلّج"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "نزولاً"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "شمالي"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "الصعوبة"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "مبتدئ"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "سهل"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "خبير"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "رماية"
@@ -24804,177 +24744,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "حرّر رماية"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "رياضة (كرة)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr ""
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "كرة القدم"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "حرّر كرة القدم"
 
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
+#: build/trans_presets.java:2067
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2072
+msgid "Baseball"
+msgstr ""
+
+#. item "Sport (Ball)/Baseball"
 #: build/trans_presets.java:2073
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
-msgid "Edit Australian Football"
-msgstr ""
-
-#: build/trans_presets.java:2079
-msgid "Baseball"
-msgstr ""
-
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "كرة السلّة"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "حرّر كرة السلّة"
 
+#: build/trans_presets.java:2084
+msgid "Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2085
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2088
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
 #: build/trans_presets.java:2091
-msgid "Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
-msgid "golf_course"
-msgstr ""
-
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
+msgid "Edit Croquet"
+msgstr ""
+
+#: build/trans_presets.java:2120
+msgid "Hockey"
+msgstr ""
+
+#. item "Sport (Ball)/Hockey"
 #: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
-msgid "Edit Croquet"
-msgstr ""
-
+msgid "Edit Hockey"
+msgstr ""
+
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
 #: build/trans_presets.java:2127
-msgid "Hockey"
-msgstr ""
-
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
-msgid "Edit Hockey"
-msgstr ""
-
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
-msgid "Edit Racquet"
-msgstr ""
-
-#: build/trans_presets.java:2145
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "تنس الطاولة"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "حرّر تنس الطاولة"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "تنس"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "حرّر تنس"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "مبنى"
@@ -24982,5 +24922,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "مبنى عام"
@@ -24988,10 +24928,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "حرّر مبنى عام"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "مبنى البلدية"
@@ -24999,10 +24939,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "حرّر مبنى البلدية"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "سفارة"
@@ -25010,10 +24950,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "حرّر سفارة"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "محكمة"
@@ -25022,10 +24962,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "حرّر محكمة"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "سجن"
@@ -25034,10 +24974,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "حرّر سجن"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "شرطة"
@@ -25047,10 +24987,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "حرّر شرطة"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "فوج إطفاء"
@@ -25059,10 +24999,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "حرّر فوج إطفاء"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "مكتب البريد"
@@ -25070,5 +25010,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "حرّر مكتب البريد"
@@ -25076,15 +25016,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "حرّر حضانة أطفال"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "مدرسة"
@@ -25092,10 +25032,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "حرّر مدرسة"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "جامعة"
@@ -25103,10 +25043,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "حرّر جامعة"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "كلّية"
@@ -25114,5 +25054,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "حرّر كلّية"
@@ -25120,5 +25060,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "سينما"
@@ -25127,10 +25067,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "حرّر سينما"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "مكتبة"
@@ -25139,9 +25079,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "حرّر مكتبة"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "مركز ثقافي"
@@ -25149,10 +25089,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "حرّر مركز ثقافي"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "مسرح"
@@ -25161,10 +25101,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "حرّر مسرح"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "معبد"
@@ -25174,5 +25114,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "حرّر معبد"
@@ -25181,6 +25121,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "الديانة"
@@ -25189,66 +25129,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "بهائي"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "بوذي"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "نصراني"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "هندوس"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "يهودي"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "مسلم"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "سيخ"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "روحاني"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "الطقوس الدينية"
@@ -25257,81 +25197,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "معمداني"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "كثليك"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "إنجيلي"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "شهود يهوه"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "لوثري"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "منهجي"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "أرثدكس"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "بروتستاني"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "شيعي"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "سنّي"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "عناوين"
@@ -25340,5 +25280,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "حرّر معلومات عنوان"
@@ -25346,5 +25286,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "رقم المنزل"
@@ -25352,25 +25292,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "تسمية المنزل"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "إسم الشارع"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "إسم المدينة"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "الرمز البريدي"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "رمز البلد"
@@ -25379,5 +25319,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "حرّر إستيفاء العنوان"
@@ -25385,61 +25325,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "مخطط الترقيم"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "مفرد"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "مثنى"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "من صنع الإنسان"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "المصانع"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "حرّر المصانع"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "برج"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "حرّر برج"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25447,25 +25387,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "خزان / برج مياه"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "حرّر خزان/برج مياه"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "خزان محروقات"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "حرّر خزان المحروقات"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "منارة"
@@ -25473,10 +25413,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "حرّر منارة"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "طاحونة هوائية"
@@ -25484,10 +25424,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "حرّر طاحونة هوائية"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "خط أنابيب"
@@ -25496,41 +25436,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "حرّر خط أنابيب"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "غاز"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "محطّة تكرير مياه"
@@ -25540,10 +25480,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "حرّر محطّة تكرير مياه"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "ونش"
@@ -25551,5 +25491,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "حرّر ونش"
@@ -25557,10 +25497,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "حرّر عمود إضاءة"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "نقطة رؤية"
@@ -25568,10 +25508,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "حرّر نقطة رؤية"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "مراقبة"
@@ -25579,23 +25519,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "حرّر كامرة مراقبة"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "مولد طاقة"
@@ -25605,35 +25545,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "حرّر مولد طاقة"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "أرياح"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "مائية"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "طاقة أحفورية"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "نووية"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "فحم"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "كهرباء شمسية"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "محطة توليد طاقة"
@@ -25642,10 +25582,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "حرّر محطة توليد طاقة"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "محطة طاقة فرعية"
@@ -25654,5 +25594,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "حرّر محطة طاقة فرعية"
@@ -25660,10 +25600,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "رقم الخط"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "عمود كهربائي"
@@ -25674,23 +25614,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "سلك/خط كهربائي"
@@ -25699,74 +25639,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "حرّر عمود كهربائي"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "خدمات/نافعات"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "مراحيض"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "الملاحظة"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "صندوق بريد"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "هاتف"
@@ -25775,5 +25715,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "حرّر هاتف"
@@ -25781,5 +25721,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "عملات معدنية"
@@ -25787,5 +25727,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "الملاحظات"
@@ -25793,5 +25733,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25799,5 +25739,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -25805,15 +25745,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "بطاقات إعتماد"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "بطاقات هاتفية"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "إعادة تصنيع الأشياء"
@@ -25822,5 +25762,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "حرّر إعادة تصنيع الأشياء"
@@ -25828,35 +25768,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "بطاريات"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "علب (معدنية)"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "ملابس"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "زجاج"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "ورق"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25864,5 +25804,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25871,31 +25811,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -25974,5 +25914,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -25982,31 +25922,31 @@
 msgstr "خضار"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26015,30 +25955,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "الإرتفاع"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "منخفض"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "نصف"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "ملء"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "مخبئ"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "نافورة"
@@ -26047,10 +25987,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "حرّر نافورة"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "ماء شفة"
@@ -26059,10 +25999,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "حرّر ماء شفة"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26071,5 +26011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26077,5 +26017,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26083,15 +26023,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "مَتاجر/دكاكين"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26099,10 +26039,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "حرّر متجر سيارات"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26111,28 +26051,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "حرر مبيع قطع دراجات"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "سوبرماركت"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "حرّر سوبرماركت"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26140,9 +26080,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "كشك"
@@ -26150,27 +26090,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "حرّر كشك"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "جزار"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "حرّر جزار"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "خباز"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "حرّر خباز"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "بائع الزهور"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "حرّر بائع الزهور"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "مأكولات عضوية"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "حرّر مبيع مأكولات عضوية"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "مشروبات"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "حاسوب"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "حرّر مبيع قطع حاسوب"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "إلكترونيات"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "حرّر إلكترونيات"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "حرّر مبيع Hifi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "أثاث/فرش"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "حرّر مبيع فرش/أثاث"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "خردوات/أدوات منزلية"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "حرّر مخزن خردوات/أدوات منزلية"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "قرطاسية"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "حرّر مبيع قرطاسية"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "حلاق"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "حرّر حلاق"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "أحذية"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "حرّر أحذية"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "ألعاب"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "حرّر مبيع ألعاب"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "مرئيّات"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "حرّر مبيع مرئيّات"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "تنظيف جاف"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "حرّر تنظيف جاف"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "مصبغة/غسيل"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "حرّر مصبغة/غسيل"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "نشاطات في الخلاء"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "حرّر متجر نشاطات في الخلاء"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "حرّر نظاراتي"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "آلة بيع"
@@ -26178,5 +26332,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr ""
@@ -26184,306 +26338,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "نوعية المبيعات"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "تذاكر_النقل_العام"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "خرائط_النقل_العام"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "تذاكر_موقف_سيارات"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "مأكولات"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "مشروبات"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "حلويات"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "سجائر"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "صور"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "مأكولات للحيوانات"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "جرائد"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "ألعاب"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "طوابع"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "رقائق SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "قسائم تعبئة هاتفية"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "قسائم"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "خريطة راكب دراجة"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "مانع الحمل"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "سدادات قطنية"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "جزار"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "حرّر جزار"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "خباز"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "حرّر خباز"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "بائع الزهور"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "حرّر بائع الزهور"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "مأكولات عضوية"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "حرّر مبيع مأكولات عضوية"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "مشروبات"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "حاسوب"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "حرّر مبيع قطع حاسوب"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "إلكترونيات"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "حرّر إلكترونيات"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "حرّر مبيع Hifi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "أثاث/فرش"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "حرّر مبيع فرش/أثاث"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "خردوات/أدوات منزلية"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "حرّر مخزن خردوات/أدوات منزلية"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "قرطاسية"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "حرّر مبيع قرطاسية"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "حلاق"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "حرّر حلاق"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "أحذية"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "حرّر أحذية"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "ألعاب"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "حرّر مبيع ألعاب"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "مرئيّات"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "حرّر مبيع مرئيّات"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "تنظيف جاف"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "حرّر تنظيف جاف"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "مصبغة/غسيل"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "حرّر مصبغة/غسيل"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "نشاطات في الخلاء"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "حرّر متجر نشاطات في الخلاء"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "حرّرمبيع  لوازم للأنشطة رياضية"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "حرّر نظاراتي"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "نقود/أموال"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "مصرف"
@@ -26491,14 +26437,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "حرّر مصرف"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "صرّاف آلي"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "صرّاف"
@@ -26506,5 +26452,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "حرّر صرّاف"
@@ -26512,15 +26458,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "حرّر صراف آلي"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "صحة"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "أطباء"
@@ -26528,18 +26474,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "حرّر أطباء"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "طبيب أسنان"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "حرّر طبيب أسنان"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "صيدلية"
@@ -26547,5 +26493,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "حرّر صيدلية"
@@ -26553,9 +26499,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "مستشفى"
@@ -26563,10 +26509,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "حرّر مستشفى"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "نقطة دخول طوارئ"
@@ -26575,5 +26521,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "حرّر نقطة دخول طوارئ"
@@ -26582,20 +26528,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "رقم النقطة"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "إسم النقطة"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "رقم الهاتف"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "إستعمل رمز دولي مثل 12-345-67890"
@@ -26603,5 +26549,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "بيطري"
@@ -26610,64 +26556,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "حرّر بيطري"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "الأماكن"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "قارة"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "حرّر قارة"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "وطن"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "حرّر وطن"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "دولة/ولاية"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "حرّر دولة/ولاية"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "قطر/منطقة"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "حرّر قطر/منطقة"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr ""
@@ -26675,15 +26621,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "مدينة"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "حرّر مدينة"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "بلدة"
@@ -26691,10 +26637,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "حرّر بلدة"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "ضاحية"
@@ -26702,25 +26648,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "حرّر ضاحية"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "قرية"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "حرّر قرية"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "قرية صغيرة"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "حرّر قرية صغيرة"
@@ -26728,5 +26674,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "محلة"
@@ -26734,10 +26680,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "حرّر محلة"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "جزيرة"
@@ -26745,10 +26691,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "حرّر جزيرة"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26756,5 +26702,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26762,5 +26708,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "مدخل كهف"
@@ -26768,10 +26714,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "حرّر مدخل كهف"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "قمّة"
@@ -26779,10 +26725,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "حرّر قمّة"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "جليد"
@@ -26790,10 +26736,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "حرّر جليد"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "بركان"
@@ -26801,70 +26747,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "حرّر بركان"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "الحدود"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "دولية"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "حرّر حدود دولية"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "إدارية"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "مدنية"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "حرّر حدود إدارية"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "حرّر الحدود السياسية"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "محمية وطنية (بيئية)"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "حرّر محمية وطنية (التنوع البيئي)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "إستعمال الأرض"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "شجرة"
@@ -26873,15 +26819,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "حرّر شجرة"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "حرّر اإسم النباتي"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "حرج"
@@ -26890,5 +26836,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "حرّر حرج"
@@ -26896,17 +26842,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "صنوبري الثمر"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "مختلط"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "غابة"
@@ -26915,14 +26861,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "حرّر غابة"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "محمية طبيعية"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "حرّر محمية طبيعية"
@@ -26930,25 +26876,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "حصاة"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "حرّر حصاة"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "أشجار منخفضة"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "حرّر أشجار منخفضة"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -26956,10 +26902,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "هوّة"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -26967,5 +26913,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "حرّر أرض بور"
@@ -26973,5 +26919,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "فناء مزرعة"
@@ -26980,45 +26926,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "حرّر فناء مزرعة"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "أرض زراعية"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "حرّر أرض زراعية"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "مرج"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "حرّر مرج"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "كرم عنب"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "حرّر كرم عنب"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "حصص سكنية"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "حرّر حصص سكنية"
@@ -27026,25 +26972,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "حديقة"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "حرّر حديقة"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "عشب"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27052,10 +26998,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "شائع"
@@ -27063,20 +27009,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "حرّر شائع"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "متنزه"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "حرّر متنزه"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "ميدان ألعاب"
@@ -27084,5 +27030,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "حرّر ميدان ألعاب"
@@ -27090,15 +27036,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "منطقة سكنية"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "حرّر منطقة سكنية"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "مقبرة"
@@ -27106,9 +27052,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "حرّر مقبرة"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "مقبرة"
@@ -27116,39 +27062,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "حرّر إستعمال الأرض كمقبرة"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "بيع بلمفرق"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "حرّر بيع بلمفرق"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "تجاري"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "حرّر إستعمال تجاري للأرض"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "صناعي"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "حرّر الإستعمال الصناعي"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "أرض سكة حديد"
@@ -27156,15 +27102,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "حرّر أرض سكة حديد"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "عسكري"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "حرّر الإستخدام العسكري للأرض"
@@ -27172,50 +27118,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "موقع ورشة إعمار"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "حرّر موقع ورشة إعمار"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "حقل أخضر"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "حرّر إستعمال الأرض كحقل أخضر"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "مطمر نفايات"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "حرّر مطمر نفايات"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "كسّارة، مقلع حجارة"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "حرّر كسّارة / مقلع حجارة"
@@ -27225,5 +27171,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "حرّر متعدد الضلوع"
@@ -27232,10 +27178,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "الفلق الخارجي"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "حرّر الفلق الخارجي"
@@ -27243,5 +27189,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "حصر الإنعطاف"
@@ -27250,5 +27196,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "حرّر حصر الإنعطاف"
@@ -27256,34 +27202,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "حصر"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "إنعطاف_يمين_ممنوع"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "على_الطول_ممنوع"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "رجوع_ممنوع"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "إنعطاف_يميني_فقط"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "إنعطاف_يسار_ممنوع"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "على_الطول_فقط"
@@ -27292,15 +27238,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "من الطريق"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "مروراً بلعقدة أو الطريق"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "إلى الطريق"
@@ -27308,5 +27254,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "الطريق"
@@ -27315,5 +27261,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "حرّر طريق"
@@ -27321,5 +27267,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "نوع الطريق"
@@ -27410,5 +27356,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27418,17 +27364,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "حافلة (باص)"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "الطريق"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "عبارة بحرية"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27488,5 +27434,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27495,9 +27441,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "ترام"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27511,10 +27457,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "وصف الرمز"
@@ -27522,31 +27468,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "الشبكة"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "المقترح"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "البديل"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "المؤقت"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "الإتصال"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "اللون (hex)"
@@ -27555,32 +27501,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "فلق الطريق"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "الفلق الأمامي"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "الفلق الخلفي"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "نقطة التوقف"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "نقطة التوقف الأمامية"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "نقطة التوقف الخلفية"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr ""
 
 #. mappaint style named "standard"
@@ -31814,7 +31835,4 @@
 #~ msgstr "غير قادر على قراءة نتائج بحث عن الإسم من الخادم"
 
-#~ msgid "bicyclemap"
-#~ msgstr "خريطة راكب دراجة"
-
 #~ msgid "Edit Station"
 #~ msgstr "حرّر محطة"
Index: /applications/editors/josm/i18n/po/bg.po
===================================================================
--- /applications/editors/josm/i18n/po/bg.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/bg.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-13 19:45+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-18 18:35+0000\n"
 "Last-Translator: pl71 <Unknown>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:38+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1201,5 +1201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Невъзможно да се премества обектите извън границите на света."
@@ -1515,5 +1515,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2281,9 +2281,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2367,27 +2367,27 @@
 msgstr "Завършване на чертането."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Изтегляне"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Създаване на области"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Изтегляне на линии"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Нарисувайте правоъгълник от желания размер и отпуснете бутона на мишката."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2408,6 +2408,6 @@
 "тази точка."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2419,9 +2419,9 @@
 msgstr "Избиране"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Избиране, преместване и завъртане на обекти"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2430,17 +2430,17 @@
 msgstr[1] "Добавяне и преместване на виртуален нов възел към {0} пътя"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Преместване на елементи"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Премести"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Отмени преместването"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2450,9 +2450,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпуснете бутона на мишката за да изберете обектите в правоъгълника."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2461,9 +2461,9 @@
 "най-близката точка."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпуснете бутона на мишката за да спрете въртенето."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3207,5 +3207,5 @@
 msgstr "Прилагане?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3787,17 +3787,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "стандартен"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "връзка"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Няма още маркирани изображения"
+msgstr ""
 
 #. teal
@@ -3980,5 +3977,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "железопътна линия"
@@ -5265,5 +5262,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "всички"
@@ -5678,4 +5675,9 @@
 msgstr "Режим на филтъра"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5766,5 +5768,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Връзки"
@@ -5866,9 +5868,9 @@
 msgstr "Избрано: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Отсъедини панела"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5877,5 +5879,5 @@
 "левия панел."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Натиснете за да минимизирате/максимизирате съдържанието на панела"
@@ -6205,4 +6207,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6215,10 +6223,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6888,145 +6890,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Име"
@@ -8245,10 +8247,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Тип"
@@ -8256,5 +8258,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8268,17 +8269,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "неизвестно"
@@ -9059,11 +9059,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9080,14 +9082,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Слой / Ниво"
@@ -9248,8 +9250,8 @@
 msgstr[0] ""
 "Качване на <strong>{0} обект</strong> към <strong>1 списък с промени</"
-"strong> като се ползва <strong>1 заявка</strong>"
+"strong>, като се ползва <strong>1 заявка</strong>."
 msgstr[1] ""
 "Качване на <strong>{0} обекта</strong> към <strong>1 списък с промени</"
-"strong> като се ползва <strong>1 заявка</strong>"
+"strong>, като се ползва <strong>1 заявка</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
@@ -9260,5 +9262,5 @@
 msgstr ""
 "Качване на <strong>{0} обекта</strong> към <strong>1 списък с промени</"
-"strong> като се ползват <strong>{1} заявки</strong>"
+"strong>, като се ползват <strong>{1} заявки</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9282,5 +9284,5 @@
 msgstr ""
 "Качване на <strong>{0} обекта</strong> към <strong>няколко списъка с "
-"промени</strong> като се ползват <strong>{1} заявки</strong>"
+"промени</strong>, като се ползват <strong>{1} заявки</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9631,5 +9633,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Описание"
@@ -10708,55 +10710,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11247,5 +11249,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Автомобил"
@@ -11267,16 +11269,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Вело"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11306,12 +11309,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Пеш"
@@ -12025,12 +12028,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Име на улица"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Измерване на стойности"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14296,6 +14297,7 @@
 msgstr "Качване на следи"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Видимост"
@@ -14386,5 +14388,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Интерполация на адреси"
@@ -14571,5 +14573,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14610,19 +14612,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Сгради"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14630,5 +14632,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14641,10 +14643,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14686,7 +14688,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Ламбертова зона 4 кеш файл (.4)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14828,5 +14829,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16695,5 +16696,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Обществен транспорт"
@@ -16745,5 +16746,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Пътни точки"
@@ -17326,4 +17327,22 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Тип"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "От..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17480,4 +17499,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Ограничения при завиване"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Ограничения при завиване"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18238,5 +18271,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Мултиполигон"
@@ -19566,7 +19599,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Означение"
@@ -19583,5 +19616,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Брой платна"
@@ -19599,4 +19632,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19604,9 +19638,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорост (км/ч)"
@@ -19634,15 +19667,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19653,11 +19680,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Еднопосочна"
@@ -19677,15 +19703,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19702,11 +19726,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19727,8 +19751,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19746,11 +19770,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Тунел"
@@ -19770,6 +19794,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19787,11 +19811,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Просека"
@@ -19811,6 +19835,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19828,11 +19852,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Насип"
@@ -19970,5 +19994,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19977,12 +20001,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19990,13 +20017,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Ширина (метри)"
@@ -20025,24 +20052,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Пътна настилка"
@@ -20054,5 +20077,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20066,11 +20089,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "асфалтиран път"
@@ -20078,10 +20100,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "неасфалтиран път"
@@ -20089,10 +20111,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "асфалт"
@@ -20100,11 +20122,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "бетон"
@@ -20112,10 +20133,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "метал"
@@ -20123,10 +20144,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "гора"
@@ -20134,10 +20155,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "павета"
@@ -20145,11 +20166,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "павиран път"
@@ -20157,10 +20177,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "чакъл"
@@ -20168,10 +20188,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "чакъл"
@@ -20179,10 +20199,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "сбито"
@@ -20190,10 +20210,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "трева"
@@ -20201,10 +20221,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "трева"
@@ -20212,10 +20232,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "пясък"
@@ -20223,10 +20243,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "земя"
@@ -20307,6 +20327,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Път (неизвестен тип)"
@@ -20315,5 +20334,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Редактиране път от неизвестен тип"
@@ -20321,6 +20340,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Пътен ремонт"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Редактиране пътен ремонт"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Пътен възел"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "кръгово"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Пътни ограничения"
@@ -20329,15 +20377,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Редактиране пътни ограничения"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Пътна такса"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Без изход"
@@ -20345,5 +20393,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Достъп"
@@ -20385,28 +20433,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "да"
@@ -20419,10 +20466,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20436,10 +20483,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20463,97 +20510,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешителен"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "селскостопански"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "не"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "предназначен"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "лек камион (до 3.5т)"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Камион (над 3.5т)"
@@ -20568,10 +20615,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Кон"
@@ -20587,10 +20634,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Мотоциклет"
@@ -20605,19 +20652,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Автомобил"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Обществен транспорт"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорост (км/ч)"
@@ -20625,20 +20672,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Макс. маса (т)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Макс.височина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "макс.ширина (метри)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "макс.дължина (метри)"
@@ -20646,5 +20693,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Кръгово движение"
@@ -20655,5 +20702,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Редактиране пътен възел"
@@ -20673,10 +20720,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "автомагистрала"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "Автомагистрална връзка"
@@ -20698,10 +20745,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "Автострадна връзка"
@@ -20723,10 +20770,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главен / първокласен"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "Връзка с главен път"
@@ -20748,5 +20795,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20761,9 +20808,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "третокласен"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "Некласифициран"
@@ -20777,9 +20824,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "улица"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "Жилищна улица"
@@ -20809,10 +20856,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "служебна"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "Направлява автобуси"
@@ -20842,5 +20889,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20852,10 +20899,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Редактирай мост"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Редактиране тунел"
@@ -20863,39 +20910,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Пътища"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Пътен ремонт"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Редактиране пътен ремонт"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Пътен възел"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "кръгово"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Черен път"
@@ -20904,73 +20922,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Редактирай черен път"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "туристически маршрут"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Пътека"
@@ -20979,38 +20965,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Редактирай пътека"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "туристически маршрут"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "за средно ниво"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ски"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -21019,5 +21035,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21025,5 +21041,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Редактиране алея за езда"
@@ -21031,5 +21047,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21047,11 +21063,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Редактиране велоалея"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Пешеходци"
@@ -21059,5 +21075,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21065,5 +21081,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21071,5 +21087,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -21078,15 +21094,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Редактиране на алея или тротоар"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Колелета"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Стъпала"
@@ -21096,10 +21108,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Редактиране на: стълби"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Магистрален възел"
@@ -21107,15 +21119,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Редактирай магистрален възел"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Услуги"
@@ -21123,5 +21135,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Редактирай служба услуги"
@@ -21161,17 +21173,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Оператор"
@@ -21180,5 +21192,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Светофар"
@@ -21188,5 +21200,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходна пътека"
@@ -21195,27 +21207,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "неконтролирано"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "светофар"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "немаркиран"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Пресичане върху кон"
@@ -21223,6 +21235,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Пресичане с велосипед"
@@ -21231,11 +21243,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Помощник при пресъчане"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Име на типа пътека (UK)"
@@ -21243,30 +21255,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "зебра"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "светофар контролиран от пешеходци"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Стоп"
@@ -21274,5 +21286,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Пешеходна пътека"
@@ -21281,14 +21293,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Редактиране на пресечно място или кръстовище"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Тип име (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21296,33 +21308,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21330,5 +21342,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21336,5 +21348,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Мини кръгово движение"
@@ -21345,14 +21357,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Посока"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "по часовниковата стрелка"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Обръщало"
@@ -21362,5 +21374,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Знак указващ начало/край на населено място"
@@ -21368,15 +21380,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Редактирай знак за ограничение в град"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Второ име"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Пътна камера"
@@ -21385,5 +21397,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Телефон за спешен случай"
@@ -21391,5 +21403,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Наклон"
@@ -21397,5 +21409,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Стръмен наклон"
@@ -21403,5 +21415,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21411,10 +21423,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Редактирай брод"
@@ -21422,5 +21434,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Планински проход"
@@ -21428,5 +21440,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Редактирай планински проход"
@@ -21438,7 +21450,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Надморска височина"
@@ -21446,5 +21458,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Прегради"
@@ -21452,5 +21464,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Стълб"
@@ -21458,5 +21470,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Редактиране на стълб"
@@ -21501,16 +21513,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Разрешено преминаване:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Вело бариера"
@@ -21519,5 +21531,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Бетонен блок"
@@ -21525,5 +21537,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Тексаска мрежа (препятствие за животни)"
@@ -21531,10 +21543,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Редактирай тексаска мрежа"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Бус трап"
@@ -21542,15 +21554,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Шипове"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Редактиране шипове"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Място за плащане пътна такса"
@@ -21558,5 +21570,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Редактирай място за плащане пътна такса"
@@ -21564,10 +21576,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Граничен контрол"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Редактирай граничен контрол"
@@ -21577,5 +21589,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Плет"
@@ -21586,22 +21598,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Ограда / стобор"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Стена"
@@ -21609,5 +21621,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Градска стена"
@@ -21616,5 +21628,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Подпорна стена"
@@ -21626,10 +21638,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Вход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Редактирай вход"
@@ -21637,5 +21649,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Порта"
@@ -21643,50 +21655,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Редактирай порта"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Вдигаще се врата"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Редактиране на вдигаща се преграда"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Редактирай врата с бодлива тел"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Накланяща преграда (bump gate)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Редактирай накланяща преграда"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Кисинг гейт (преграда срещу животни)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Редактирай кисинг гейт"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Стълби за преминаване през ограда"
@@ -21694,25 +21706,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Редактиране на: стълби за преминаване през ограда"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "турникет (контрол на достъпа)"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "редактиране на: турникет"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Двойна врата"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Редактирай двойна врата"
@@ -21723,11 +21735,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Извор"
@@ -21735,5 +21747,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Редактирай извора"
@@ -21741,5 +21753,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Отточен канал"
@@ -21747,10 +21759,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Редактирай отточен канал"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21758,10 +21770,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Поток"
@@ -21769,10 +21781,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Редактирай поток"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Канал"
@@ -21780,10 +21792,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Редактирай канал"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Река"
@@ -21793,5 +21805,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Редактирай река"
@@ -21799,15 +21811,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Редактирай водата"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Редактирай сушата"
@@ -21815,15 +21827,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Басейн"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Редактиране на басейн"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Резервоар"
@@ -21831,15 +21843,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Редактирай резервоар"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Закрит резервоар"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Редактирай закрит резервоар"
@@ -21847,5 +21859,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Речен бряг"
@@ -21854,10 +21866,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Редактирай речен бряг"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Мочурище"
@@ -21868,14 +21880,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Редактирай мочурището"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "блато"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "тресавище"
@@ -21889,35 +21901,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "блато"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "тръстенак"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "солени блата / солници"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "приливно-отливно крайбрежие"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "мангрова гора"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Кал"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Редактирай калта"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Плаж"
@@ -21925,20 +21937,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Редактирай плажа"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Залив"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Редактирай залива"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Скала"
@@ -21946,10 +21958,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Редактирай скалата"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Крайбрежие"
@@ -21957,5 +21969,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Редактирай крайбрежието"
@@ -21963,5 +21975,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Ферибот маршрут"
@@ -21969,5 +21981,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Ферибот"
@@ -21976,5 +21988,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Корабостроителница"
@@ -21982,10 +21994,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Редактирай корабостроителница"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Док"
@@ -21993,5 +22005,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Редактирай док"
@@ -21999,5 +22011,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Язовирна стена"
@@ -22005,15 +22017,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Редактирай язовирна стена"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Хидротехническо съоръжение"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Шлюзова врата"
@@ -22022,5 +22034,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Бент / преливник"
@@ -22028,20 +22040,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Редактирай бент / преливник"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Редактирай водопад"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Разширение за обръщане"
@@ -22050,15 +22062,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Пристанище за яхти"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Редактирай пристанище за яхти"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Кей"
@@ -22066,10 +22078,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Редактирай кей"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Ферибот терминал"
@@ -22077,10 +22089,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Редактирай ферибот терминал"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Хелинг"
@@ -22090,20 +22102,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Редактирай хелинг"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Железница"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "ЖП Линия"
@@ -22111,5 +22123,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Редактирай ЖП Линия"
@@ -22139,86 +22151,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "стандартен"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22230,8 +22167,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22245,29 +22182,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "Депо"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "ЖП стрелка"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "скоростна"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22280,8 +22217,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22352,8 +22289,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22365,8 +22302,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Волтаж"
@@ -22379,8 +22316,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22393,23 +22330,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Теснолинейка"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Редактирай теснолинейка"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Монорелса"
@@ -22417,50 +22354,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Редактирай монорелса"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Историческа ЖП линия"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Редактирай историческа ЖП линия"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Лека ЖП линия"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Редактирай лека ЖП линия"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Метро"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Редактирай метро"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Трамвай"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Редактирай трамвай"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Направляван автобус"
@@ -22468,5 +22405,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Редактирай направляван автобус"
@@ -22475,10 +22412,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Неизползвана ЖП линия"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Редактирай неизползвана ЖП линия"
@@ -22487,9 +22424,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Незадължителни типове"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Изоставена ЖП линия"
@@ -22498,5 +22435,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Регулиран ЖП прелез"
@@ -22505,5 +22442,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "ЖП прелез"
@@ -22513,5 +22450,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Тип пресичане"
@@ -22519,5 +22456,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "ЖП Обръщаща платформа"
@@ -22526,5 +22463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22533,10 +22470,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Надземни линии"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Седалков лифт"
@@ -22544,10 +22481,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Редактирай седалков лифт"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Влек"
@@ -22555,10 +22492,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Редактирай влек"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Кабинков лифт"
@@ -22566,10 +22503,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Редактирай кабинков лифт"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Гондола"
@@ -22577,10 +22514,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Редактиране на гондола"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22589,5 +22526,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22595,5 +22532,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22602,5 +22539,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22608,5 +22545,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Бензиностанция"
@@ -22616,62 +22553,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Редактирай бензиностанция"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22729,32 +22666,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Работно време"
@@ -22813,165 +22750,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "денонощно"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "понеделник-петък 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "вторник-неделя 08:00-15:00; събота 08:00-12:00"
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22988,5 +22925,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22996,5 +22933,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Редактирай паркинг"
@@ -23005,25 +22942,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Ref номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "на няколко нива"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "наземен"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "подземен"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -23032,48 +22969,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Такса"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Капацитет (общ)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Места за инвалиди"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Запазени места за жени"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Запазени места за родители"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Автомивка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Редактирай автомивка"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Сервиз"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Редактирай автосервиз"
@@ -23081,5 +23018,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Под наем"
@@ -23088,10 +23025,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Редактиране коли под наем"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Споделяне на автомобили"
@@ -23099,5 +23036,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Редактирай споделяне автомобили"
@@ -23105,10 +23042,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Велосипедна стоянка (паркинг)"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Капацитет"
@@ -23117,10 +23054,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Редактиране велосипеди под наем"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23130,5 +23067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23136,5 +23073,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Референция"
@@ -23142,5 +23079,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Малка ЖП гара"
@@ -23148,5 +23085,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Редактирай малка ЖП гара"
@@ -23154,5 +23091,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Трамвайна спирка"
@@ -23161,5 +23098,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Редактирай трамвайна спирка"
@@ -23167,5 +23104,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "ЖП платформа"
@@ -23174,5 +23111,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Редактирай ЖП платформа"
@@ -23184,5 +23121,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Референция (коловоз #)"
@@ -23190,10 +23127,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Област"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -23202,10 +23139,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Редактирай вход в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Инвалидна количка"
@@ -23214,5 +23151,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Автогара"
@@ -23221,5 +23158,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Редактирай автогара"
@@ -23227,5 +23164,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Автобусна спирка"
@@ -23235,5 +23172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Редактирай автобусна спирка"
@@ -23242,6 +23179,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Навес"
@@ -23249,19 +23186,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Автобусна платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Редактирай автобусна платформа"
@@ -23269,5 +23206,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Такси"
@@ -23275,5 +23212,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Редактирай стоянка таксита"
@@ -23281,10 +23218,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Летище"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23292,5 +23229,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23298,10 +23235,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23310,5 +23247,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23316,5 +23253,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23322,5 +23259,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23328,5 +23265,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23334,5 +23271,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23340,5 +23277,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23348,5 +23285,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23356,5 +23293,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23365,6 +23302,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Маяк / Радиопредавател"
@@ -23374,5 +23311,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23381,5 +23318,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23387,5 +23324,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23393,15 +23330,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Пътуване"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Настаняване"
@@ -23413,5 +23350,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Хотел"
@@ -23420,15 +23357,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Редактирай хотел"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Звезди"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Мотел"
@@ -23436,20 +23373,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Редактирай мотел"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Къща за гости"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Редактирай къща за гости"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Бунгало"
@@ -23457,10 +23394,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Редактирай бунгало"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Хостел / студентско общежитие"
@@ -23468,30 +23405,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Редактирай хостел / студентско общежитие"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Редактирай планинска хижа"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Редактирай площадка за каравани"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Къмпинг"
@@ -23499,10 +23436,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Редактирай къмпинг"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Храна и напитки"
@@ -23513,5 +23450,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторант"
@@ -23519,5 +23456,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Редактирай ресторант"
@@ -23525,5 +23462,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Кухня"
@@ -23531,73 +23468,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "италианска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "китайска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "пица"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "бургери"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "гръцка"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "немска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "индийска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "местна"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "кебаб"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "турска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "азиатска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "тайландска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "мексиканска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "японска"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Заведение за бързо хранене"
@@ -23605,17 +23542,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Редактирай заведение бързо хранене"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Кафене"
@@ -23623,9 +23560,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Редактирай кафене"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Бар"
@@ -23633,18 +23570,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Редактирай бар"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Бирария"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Редактирай бирария"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Бар"
@@ -23652,9 +23589,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Редактиране на бар"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Нощен клуб"
@@ -23662,24 +23599,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Редактирай нощен клуб"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Туризъм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Атракция"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Редактирай забележилтеност"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Музей"
@@ -23687,9 +23624,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Редактирай музей"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -23698,9 +23635,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Редактирай зоопарк"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Място с добра гледка"
@@ -23708,24 +23645,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Редактирай място с добра гледка"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Наблюдателница"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Развлекателен парк"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Редактирай развлекателен парк"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Творба на изкуството"
@@ -23733,5 +23670,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Редактирай творба на изкуството"
@@ -23739,19 +23676,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Информационен пункт"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23789,5 +23726,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23795,28 +23732,28 @@
 msgstr "улица"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "схема"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "място"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "град"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "район"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "По-подробно описание"
@@ -23826,5 +23763,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Показани са пътища за:"
@@ -23832,5 +23769,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Туристическа пътека"
@@ -23838,6 +23775,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Велосипедизъм"
@@ -23845,5 +23782,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Планинско колоездене"
@@ -23851,6 +23788,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ски"
@@ -23858,5 +23795,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Колоездене"
@@ -23864,46 +23801,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... възможни са други способи за придвижване"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Информационно табло"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Съдържание на таблото"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "табела"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "дива природа"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Упътване"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Информационен пункт"
@@ -23911,29 +23848,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "По-точно описание"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Аудио напътствия"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Аудио-напътствия по мобилен телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Тел. номер"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Други информационни точки"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Редактирай навес"
@@ -23941,25 +23878,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Огнище"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Място за пикник"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Редактирай място за излет"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Исторически места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Замък"
@@ -23968,19 +23905,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Редактирай замък"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Руини"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Редактирай руини"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Архиологични разкопки"
@@ -23989,9 +23926,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Редактирай архиологични разкопки"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Поле на битка"
@@ -23999,10 +23936,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Редактирай поле на битка"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -24010,5 +23947,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -24016,15 +23953,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Забележителност"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Редактирай забележителност"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Паметник"
@@ -24032,55 +23969,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Редактирай паметник"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Редактирай крайпътен кръст"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Редактирай крайпътен параклис"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Пограничен камък"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "редактиране на: Пограничен камък"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Места за отдих и развлечения"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Редактирай аквапарк"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Площадка"
@@ -24088,35 +24025,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Редактирай площадка"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Риболов"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Редактирай риболов"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Спортни съоражения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Редактирай стадион"
@@ -24130,6 +24067,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "вид спорт:"
@@ -24521,6 +24458,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24554,225 +24491,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "многобой"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "стрелба с лък"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "австралийски футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "игра с мет.топчета"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "игра с асим.топки"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "кану"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "алпинизъм"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "крикет мрежи"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "кучешки надбягвания"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "конна езда"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "голф"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "хокей"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "конни надбягвания"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "моторен спорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "бейзбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "ракет бол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ръгби"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "стрелба"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "фигурно пързаляне"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "ски"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "плуване"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "тенис на маса"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "тенис"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Спортен център"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Редактирай спортен център"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Игрище"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Редактирай игрище"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Състезателна писта"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Редактирай състезателна писта"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Поле за голф"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Редактирай поле за голф"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Миниголф"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Редактирай миниголф"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Многобой"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Редактирай многобой"
@@ -24811,21 +24748,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "тип"
@@ -24864,203 +24801,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "игрище"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "спортен център"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "следа"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Боулинг зала"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Редактирай боулинг зала"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Редактирай атлетика"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Стрелба с лък"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Редактирай стрелба с лък"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Скално катерене"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Редактирай скално катерене"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Кану"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Редактирай кану"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Редактирай велосипедизъм"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Надпреварване с кучета"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Редактирай надбягвания с кучета"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Конна езда"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Редактирай конна езда"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Конни надбягвания"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Редактирай конни надбягвания"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Редактирай гимнастика"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Моторни спортове"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Редактирай моторни спортове"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Фигурно пързаляне"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Редактирай фигурно пързаляне"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Скейтборд"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Редактирай скейтборд"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Плуване"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Редактирай плуване"
@@ -25068,52 +25005,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Редактирай ски"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Тип писта"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "спускане"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "нордическа"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "Зимен парк"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Трудност"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "начинаещ"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "лесно"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "за напреднали"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "експерт"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "свободна езда"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Стрелба"
@@ -25121,177 +25058,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Редактирай стрелба"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Спорт (с топка)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Футбол"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Редактирай футбол"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Американски футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Редактирай американски футбол"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Австралийски футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Редактирай австралийски футбол"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Редактирай бейсбол"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Редактирай баскетбол"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Голф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Редактирай голф"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "поле за голф"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Буле (игра с мет.топчета)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Редактирай Игра с мет.топчета"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Игра с асим.мет.топки (bowls)"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Редактирай игра с асим.мет.топки"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Редактирай крикет"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Крикет мрежи"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Рекдатирай крикет мрежи"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Редактирай крокет"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Хокей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Редактирай хокей"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Редактирай пелота"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "ракет"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Редактирай ракет"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ръгби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Редактирай ръгби"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Тенис на маса"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Редактирай тенис на маса"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Тенис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Редактирай тенис"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Изкуствени"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Сграда"
@@ -25299,5 +25236,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Обществена сграда"
@@ -25305,10 +25242,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Редактирай обществена сграда"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Кметство"
@@ -25316,10 +25253,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Редактирай кметство"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Посолство"
@@ -25327,10 +25264,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Редактирай посолство"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Съдебна сграда"
@@ -25339,10 +25276,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Редактирай съдебна сграда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Затвор"
@@ -25351,10 +25288,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Редактирай затвор"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Полиция/Милиция"
@@ -25364,10 +25301,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Редактирай полиция/милиция"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Пожарна"
@@ -25376,10 +25313,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Редактирай пожарна"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Пощенска станция"
@@ -25387,5 +25324,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Редактирай пощенска станция"
@@ -25393,15 +25330,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Редактирай детска градина"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Училище"
@@ -25409,10 +25346,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Редактирай училището"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Университет"
@@ -25420,10 +25357,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Редактирай университет"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Колеж"
@@ -25431,5 +25368,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Редактирай колеж"
@@ -25437,5 +25374,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Кино"
@@ -25444,10 +25381,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Редактирай кино"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Библиотека"
@@ -25456,9 +25393,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Редактирай библиотека"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Център на изкуствата"
@@ -25466,10 +25403,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Редактирай център на изкуствата"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Театър"
@@ -25478,10 +25415,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Редактирай театър"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Място за богослужение"
@@ -25491,5 +25428,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Редактирай място за богослужение"
@@ -25498,6 +25435,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Религия"
@@ -25506,66 +25443,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "Бахаи"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "Будизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "Християнство"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "Индуизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "Джайнизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "Юдаизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "Мусулманство"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "Сикхизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "Спиритуализъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "Даосизъм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "Унитаристи"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "Зороастризъм"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Конфесия"
@@ -25574,81 +25511,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "Англиканска"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "Баптизъм"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "Католическо"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "Евангелска"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Свидетели на Йехова"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "Лютеранство"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "Методизъм"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "Мормони"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "Православие"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "Петдесетници"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "Пресвитериани"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "Протестантизъм"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "Кваркери"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "Шийти"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "Сунити"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Адреси"
@@ -25657,5 +25594,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Редактиране на информацията за адреса"
@@ -25663,5 +25600,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Номер"
@@ -25669,25 +25606,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Име на дом"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Име на улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Име на град"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Пощенски код"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Код на държава"
@@ -25696,5 +25633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Редактирай интерполация на адреси"
@@ -25702,61 +25639,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Схема на номериране"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "нечетни"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "четни"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "по азбучен ред"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Изкуствени"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Цех"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Редактирай цех"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Кула"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Редактирай кула"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Тип на кулата"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Височина (в метри)"
@@ -25764,25 +25701,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Водонапорна кула"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Редактирай водонапорна кула"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Газохранилище"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Редактирай газохранилище"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Маяк / Светлинен фар"
@@ -25790,10 +25727,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Редактирай маяк / светлинен фар"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Мелница"
@@ -25801,10 +25738,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Редактирай мелница"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Тръбопровод"
@@ -25813,41 +25750,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Редактирай газопровод"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "нефт"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "отходна тръба"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Местоположение"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "подводно"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Пречиствателна станция"
@@ -25857,10 +25794,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Редактирай пречиствателна станция"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Кран"
@@ -25868,5 +25805,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Редактирай кран"
@@ -25874,10 +25811,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Редактирай маяк / радиопредавател"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Точка на наблюдение"
@@ -25885,10 +25822,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Редактирай точка на наблюдение"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Видеонаблюдение"
@@ -25896,23 +25833,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Редактирай видеонаблюдение"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Електроцентрала"
@@ -25922,35 +25859,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Редактирай електрогенератор"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "вятърна енергия"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "водна енергия"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "енергия от изкопаеми горива"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "атомна"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "въглища"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "слънчева енергия"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Електростанция"
@@ -25959,10 +25896,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Редактирай електростанция"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Електроподстанция"
@@ -25971,5 +25908,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Редактирай електроподстанция"
@@ -25977,10 +25914,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Номер линия"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Електрически стълб от ЕПМ"
@@ -25991,23 +25928,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Редактирай стълб от ЕПМ"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "кула"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Линия за електропренос"
@@ -26016,74 +25953,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Редактирай линия за електропренос"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Тип на линия"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "линия"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "второстепенна линия"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Брой проводници"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Брой на жилата на всеки кабел"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "един"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "два"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "три"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "четири"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Обществени удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Тоалетни"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Забележка"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Пощенска кутия"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Телефон"
@@ -26092,5 +26029,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Редактирай телефон"
@@ -26098,5 +26035,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Монети"
@@ -26104,5 +26041,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Банкноти"
@@ -26110,5 +26047,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Електрони средства за разплата"
@@ -26116,5 +26053,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Дебитни карти"
@@ -26122,15 +26059,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Кредитни карти"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Телефонни карти"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Рециклиране"
@@ -26139,5 +26076,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Редактиране на станция за рециклиране"
@@ -26145,35 +26082,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Батерии"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Консервни кутии"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Дрехи"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Стъкло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Хартия"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Вторични суровини"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26181,5 +26118,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26188,31 +26125,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "камък"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "пластмаса"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Цвят"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "черно"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "кафяво"
@@ -26291,5 +26228,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26299,31 +26236,31 @@
 msgstr "зеленина"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "червено"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "синьо"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "сиво"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "бяло"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Брой седящи места"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Ловно скривалище"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Редактирай ловно скривалище"
@@ -26332,30 +26269,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Височина"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "нисък"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "среден"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "пълен"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Скривалище"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Заключване"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Фонтан"
@@ -26364,10 +26301,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Редактирай фонтан"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Питейна вода"
@@ -26376,10 +26313,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Редактирай питейна вода"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26388,5 +26325,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26394,5 +26331,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Дестка ясла"
@@ -26400,15 +26337,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Редактирай детска ясла"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Магазини"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26416,10 +26353,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Редактирай автосалон"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26428,38 +26365,38 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Редактирай вело-магазин"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Редактирай супермаркет"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Аптека"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Редактиране на: аптека"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
-msgstr "Бакалия"
+msgstr "Хранителни стоки"
 
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
-msgstr "Редактирай бакалия"
-
-#: build/trans_presets.java:2564
+msgstr "Редактиране на \"магазин за хранителни стоки\""
+
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Будка"
@@ -26467,27 +26404,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Редактирай будка"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Книжарница"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Редактиране на книжарница"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Туристическа агенция"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Редактиране на туристическа агенция"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Месарница"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Редактирай месарница"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Фурна"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Редактирай фурна"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Цветарски магазин"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Редактирай цветарски магазин"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Био магазин"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Редактирай био магазин"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Алкохол"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Редактиране магазин за алкохол"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Напитки"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Редактиране магазин за безалкохолни"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Компютри"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Редактирай компютърен магазин"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Електроника"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Редактирай магазин за електроника"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Аудио HiFi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Редактирай магазин за Аудио HiFi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Мебелен магазин"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Редактирай мебелен магазин"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Градински център"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Редактирай градински център"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Железария"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Редактирай железария"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Магазин \"Направи си сам\""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Редактирай магазин \"Направи си сам\""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Книжарница"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Редактирай книжарница"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Фризьорски салон / козметика"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Редактирай фризьорски салон / козметика"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Обувки"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Редактирай магазин за обувки"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Играчки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Редактирай магазин за играчки"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Видео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Редактирай Видео-магазин"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Химическо чистене"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Редактирай химическо чистене"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Пералня"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Редактирай пералня"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Туристически стоки (за активен отдих)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Редактирай мазизин за туристически стоки"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Редактирай магазин за спортни стоки"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Редактирай оптика"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Автомат за стоки"
@@ -26495,5 +26646,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Редактирай автомат за стоки"
@@ -26501,306 +26652,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Продукти за автоматична продажба"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "билети за обществен транспорт"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "карта на обществен транспорт"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "билети за паркиране"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "храна"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "сладки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "цигари"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "храна за животни"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "вестници"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "играчки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "пощенски марки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-карти"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "телефонни ваучери"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "ваучери"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "велосипед"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "презервативи"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "тампони"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "торби за екскременти"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "клиентски карти"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Месарница"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Редактирай месарница"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Фурна"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Редактирай фурна"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Цветарски магазин"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Редактирай цветарски магазин"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Био магазин"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Редактирай био магазин"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Алкохол"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Редактиране магазин за алкохол"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Напитки"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Редактиране магазин за безалкохолни"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Компютри"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Редактирай компютърен магазин"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Електроника"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Редактирай магазин за електроника"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Аудио HiFi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Редактирай магазин за Аудио HiFi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Мебелен магазин"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Редактирай мебелен магазин"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Градински център"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Редактирай градински център"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Железария"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Редактирай железария"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Магазин \"Направи си сам\""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Редактирай магазин \"Направи си сам\""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Книжарница"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Редактирай книжарница"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Фризьорски салон / козметика"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Редактирай фризьорски салон / козметика"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Обувки"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Редактирай магазин за обувки"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Играчки"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Редактирай магазин за играчки"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Видео"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Редактирай Видео-магазин"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Химическо чистене"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Редактирай химическо чистене"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Пералня"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Редактирай пералня"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Туристически стоки (за активен отдих)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Редактирай мазизин за туристически стоки"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Редактирай магазин за спортни стоки"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Оптика"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Редактирай оптика"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Пари"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Банка"
@@ -26808,14 +26751,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Редактирай банка"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Обмяна на валута"
@@ -26823,5 +26766,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Редактирай обмяна на валута"
@@ -26829,15 +26772,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Редактирай банкомат"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Здраве"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Доктори"
@@ -26845,18 +26788,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Редактирай доктори"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Стоматолог"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Редактирай стоматолигия"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -26864,5 +26807,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Редактирай аптека"
@@ -26870,9 +26813,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Приготвят лекарства по рецепти"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Болница"
@@ -26880,10 +26823,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Редактирай болница"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Пункт за връзка със спешна помощ"
@@ -26892,5 +26835,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Редактирай пункт за връзка със спешна помощ"
@@ -26899,20 +26842,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Номер на пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Име на пункта"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Телефонен номер"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Използвайте международен код, като например +12-345-67890)"
@@ -26920,5 +26863,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Ветеринар"
@@ -26927,64 +26870,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Редактирай ветеринар"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Редактирай континент"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Държава"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Редактирай държава"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Област/Щат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Редактирай област/щат"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Област"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Редактирай област"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Графство"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Редактирай графство"
@@ -26992,15 +26935,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Град (над 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Редактирай голям град"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Град (под 100 000)"
@@ -27008,10 +26951,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Редактирай град"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Квартал/предградие"
@@ -27019,25 +26962,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Редактирай квартал"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Редактирай село"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Махала"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Редактирай махала"
@@ -27045,5 +26988,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Местност"
@@ -27051,10 +26994,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Редактирай местност"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Остров"
@@ -27062,10 +27005,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Редактирай остров"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Скала"
@@ -27073,5 +27016,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Редактиране на: скала"
@@ -27079,5 +27022,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Пещерен вход"
@@ -27085,10 +27028,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Редактиране пещерен вход"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Връх"
@@ -27096,10 +27039,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Редактиране връх"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Ледник"
@@ -27107,10 +27050,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Редактиране ледник"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Вулкан"
@@ -27118,70 +27061,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Редактиране вулкан"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Граници"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Национална"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Редактирай национална граница"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Административна"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Редактирай административна граница"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Гражданска"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Редактирай гражданска граница"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Политическа"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Редактирай политическа граница"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Национален парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Редактирай граница национален парк"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Земеползване"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Дърво"
@@ -27190,15 +27133,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Редактирай дърво"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Ботаническо название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Гора"
@@ -27207,5 +27150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Редактирай гората"
@@ -27213,17 +27156,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "иглолистен"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "широколистен"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "смесен"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Гора"
@@ -27232,14 +27175,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Редактирай гора"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Природен резерват"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Редактирай природен резерват"
@@ -27247,25 +27190,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Сипей"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Редактирай сипей"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Шубрак"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Редактирай шубрака"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Скалист склон"
@@ -27273,10 +27216,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Редактирай скалист склон"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Пустош"
@@ -27284,5 +27227,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Редактиране пустош"
@@ -27290,5 +27233,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Двор ферма"
@@ -27297,45 +27240,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Редактирай двор ферма"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Обработваема земя"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Редактирай обработваема земя"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Поляна"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Редактиране поляна"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Лозе"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Редактирай лозе"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Земя за лично ползване"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Редактиране на: Земя за лично ползване"
@@ -27343,25 +27286,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Градина"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Редактирай градина"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Трева"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Редактирай трева"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Зелено село"
@@ -27369,10 +27312,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Редактирай зелено селище"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Общи"
@@ -27380,20 +27323,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Редактирай общи"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Редактирай парк"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Спортна площадка"
@@ -27401,5 +27344,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Редактирай спортна площадка"
@@ -27407,15 +27350,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Жилищна зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Редактирай жилищна зона"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Църковно гробище"
@@ -27423,9 +27366,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Редактирай църковно гробище"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Гробище"
@@ -27433,39 +27376,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Редактирай гробище"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Търговия на дребно"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Редактирай търговия на дребно"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Търговия"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Редактирай търговия"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Промишленост"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Редактирай промишленост"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Железопътен път"
@@ -27473,15 +27416,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Редактирай ЖП"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Военен"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Редакирай военна земя"
@@ -27489,50 +27432,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Строителна площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Редактирай строителна площадка"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Индустриални развалини"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Редактирай ундустриални развалини"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Зелени площи"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Редактирай зелени площи"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Сметище"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Редактирай сметище"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Кариера"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Редактирай кариера"
@@ -27542,5 +27485,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Редактиране мултиполигон"
@@ -27549,10 +27492,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "външен сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "вътрешен сегмент"
@@ -27560,5 +27503,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Ограничения при завиване"
@@ -27567,5 +27510,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Редактиране на ограничения при завиване"
@@ -27573,34 +27516,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Ограничения"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "забранен ляв завой"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "забранен десен завой"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "забранено напред"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "забранен обратен завой"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "само десен завой"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "само ляв завой"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "само направо"
@@ -27609,15 +27552,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "от път"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "през точка или път"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "до път"
@@ -27625,5 +27568,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Маршрут"
@@ -27632,5 +27575,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Редактиране маршрут"
@@ -27638,5 +27581,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Тип маршрут"
@@ -27727,5 +27670,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27735,17 +27678,17 @@
 msgstr "велосипед"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "автобус"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "път"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ферибот"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ски"
@@ -27805,5 +27748,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27812,9 +27755,9 @@
 msgstr "пеш"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "трамваен маршрут"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "обиколка"
@@ -27828,10 +27771,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Описание на символ"
@@ -27839,31 +27782,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Мрежа"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Състояние на пътя"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "предложен"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "алтернативен"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "временен"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "връзка"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Цвят (hex)"
@@ -27872,32 +27815,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "сегмент от маршрут"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "сегмент напред"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "точка за спиране"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "точка за спиране напред"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "точка за спиране назад"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "стандартен"
 
 #. mappaint style named "standard"
@@ -31920,4 +31938,7 @@
 msgid "Sicily - Italy"
 msgstr "Сицилия - Италия"
+
+#~ msgid "Bikes"
+#~ msgstr "Колелета"
 
 #~ msgid ""
Index: /applications/editors/josm/i18n/po/cs.po
===================================================================
--- /applications/editors/josm/i18n/po/cs.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/cs.po	(revision 20945)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 21:42+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-20 10:16+0000\n"
+"Last-Translator: Jezevec <Unknown>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1201,5 +1201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Nemohu přesouvat objekty mimo svět."
@@ -1519,5 +1519,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2296,9 +2296,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2382,26 +2382,26 @@
 msgstr "Dokončit kreslení"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Vytlačit"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Vytvořit plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Vytáhnout cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Nakreslete obdélník požadované velikosti a pak pusťte myší tlačítko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2419,6 +2419,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2430,9 +2430,9 @@
 msgstr "Vybrat"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Zvol, posuň a otáčej objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2442,17 +2442,17 @@
 msgstr[2] "Přidat a posunout virtuální nový uzel do {0} cest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Přesun prvků"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Přesunout je"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Vrátit zpět přesun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2465,19 +2465,19 @@
 "Opravdu přesunout?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pusťte myší tlačítko k vybrání obejktů v obdélníku"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Uvolněte tlačítko myši pro ukončení pohybu. Ctrl sloučí s nejbližším uzlem."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Pusťte myší tlačítko k zastavení otaáčení"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3229,5 +3229,5 @@
 msgstr "Použít ?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3807,17 +3807,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standardní"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "spojení"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Neotagované obrázky"
+msgstr ""
 
 #. teal
@@ -3998,5 +3995,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "železnice"
@@ -4306,5 +4303,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:178
 msgid "Installing updated plugins"
-msgstr ""
+msgstr "Instaluji aktualizované pluginy"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:182
@@ -5306,5 +5303,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "všechny"
@@ -5316,5 +5313,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:68
 msgid "Please decide which values to keep"
-msgstr "Rozhodněte, které hodnoty ponechat"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:73
@@ -5726,4 +5723,9 @@
 msgstr "Mód filtrování"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5814,5 +5816,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relace"
@@ -5914,9 +5916,9 @@
 msgstr "Výběr: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Vytrhnout panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5925,5 +5927,5 @@
 "nástrojů."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Minimalizovat nebo maximalizovat obsah panelu"
@@ -6045,5 +6047,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
 msgid "Download changeset content"
-msgstr ""
+msgstr "Stáhnout obsah sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
@@ -6142,5 +6144,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:308
 msgid "Download the changeset content from the OSM server"
-msgstr ""
+msgstr "Stáhnout obsah sady změn z OSM serveru"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:199
@@ -6161,5 +6163,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:250
 msgid "Download and show the history of the selected primitives"
-msgstr ""
+msgstr "Stáhnout a zobrazit historii vybraných prvků"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:315
@@ -6170,5 +6172,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:317
 msgid "Select the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Vybrat odpovídající prvky v aktuální datové vrstvě"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:324
@@ -6196,5 +6198,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:379
 msgid "Zoom to the corresponding primitives in the current data layer"
-msgstr ""
+msgstr "Přiblížit na odpovídající prvky v aktuální datové vrstvě"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:393
@@ -6213,13 +6215,13 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:465
 msgid "Download the changeset content"
-msgstr ""
+msgstr "Stáhnout obsah sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:50
 msgid "Created"
-msgstr ""
+msgstr "Vytvořeno"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:51
 msgid "Updated"
-msgstr ""
+msgstr "Aktualizováno"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java:52
@@ -6258,4 +6260,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6268,10 +6276,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6941,145 +6943,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Název"
@@ -7143,5 +7145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetHeaderDownloadTask.java:127
 msgid "Download changesets"
-msgstr ""
+msgstr "Stáhnout sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetListCellRenderer.java:36
@@ -7169,5 +7171,5 @@
 msgid ""
 "Download the changeset with the specified id, including the changeset content"
-msgstr ""
+msgstr "Stáhnout sadu změn se zadaným id včetně obsahu"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
@@ -7282,5 +7284,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714
 msgid "Created before - "
-msgstr ""
+msgstr "Vytvořeno před - "
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:765
@@ -7425,5 +7427,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:137
 msgid "Advanced"
-msgstr ""
+msgstr "Rozšířené"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58
@@ -8321,10 +8323,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Typ"
@@ -8332,5 +8334,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8344,17 +8345,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "neznámý"
@@ -8388,4 +8388,10 @@
 "a>.</p></html>"
 msgstr ""
+"<html><p class=\"warning-header\">Nápověda k vybranému tématu neexistuje</"
+"p><p class=\"warning-body\">Nápověda na téma  <strong>{0}</strong> není "
+"dosud dostupná. Chybí jak vaše lokální jazyková verze ({1}) tak verze "
+"anglická.<br><br>Prosíme pomozte vylepšit JOSM a doplňte chybějící "
+"informace. Můžete upravovat <a href=\"{2}\">nápovědu ve vašem jazyce ({1})</"
+"a> a v <a href=\"{3}\">angličtině</a>.</p></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
@@ -8785,8 +8791,10 @@
 "the changeset after the next upload."
 msgstr ""
+"Prosím rozhodněte, do jaké sady změn budou data nahrána, případně zda bude "
+"sada po nahrání dat uzavřena."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:89
 msgid "Upload to a new changeset"
-msgstr ""
+msgstr "Nahrát do nové sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:90
@@ -8796,5 +8804,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:99
 msgid "Upload to an existing changeset"
-msgstr ""
+msgstr "Nahrát do existující sady změn"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:100
@@ -8995,5 +9003,5 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr "Do souboru ''{0}'' nelze zapisovat. Prosíme, vyberte jiný soubor."
+msgstr "Do souboru ''{0}'' nelze zapisovat. Zadejte prosím jiný název."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -9149,11 +9157,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9170,14 +9180,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Vrstva"
@@ -9246,5 +9256,5 @@
 #, java-format
 msgid "Upload to ''{0}''"
-msgstr ""
+msgstr "Nahrát na ''{0}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:355
@@ -9298,5 +9308,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:44
 msgid "Objects are uploaded to a <strong>new changeset</strong>."
-msgstr ""
+msgstr "Objekty budou nahrány do <strong>nové sady změn</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
@@ -9311,5 +9321,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:55
 msgid "The changeset is going to be <strong>closed</strong> after this upload"
-msgstr ""
+msgstr "Sada změn bude po nahrání na server <strong>uzavřena</strong>."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:57
@@ -9363,5 +9373,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:102
 msgid "advanced configuration"
-msgstr ""
+msgstr "rozšířená konfigurace"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
@@ -9493,18 +9503,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
 msgid "Please select the upload strategy:"
-msgstr ""
+msgstr "Prosím vyberte způsob nahrávání"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:110
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:343
 msgid "Upload data in one request"
-msgstr ""
+msgstr "Nahrát data v jednom požadavku"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:131
 msgid "Upload data in chunks of objects. Chunk size: "
-msgstr ""
+msgstr "Nahrát data po částech. Velikost části: "
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:158
 msgid "Upload each object individually"
-msgstr ""
+msgstr "Nahrát každý objekt samostatně"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
@@ -9557,6 +9567,7 @@
 msgid "({0} request)"
 msgid_plural "({0} requests)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "({0} požadavek)"
+msgstr[1] "({0} požadavky)"
+msgstr[2] "({0} požadavků)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411
@@ -9734,5 +9745,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Popis"
@@ -10839,55 +10850,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11368,5 +11379,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Auto"
@@ -11388,16 +11399,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Cyklisté"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11427,12 +11439,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Pěší"
@@ -11667,6 +11679,7 @@
 msgid_plural ""
 "The following {0} plugins have been downloaded <strong>successfully</strong>:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Následující plugin byl stažen <strong>úspěšně</strong>:"
+msgstr[1] "Následující {0} pluginy byly staženy <strong>úspěšně</strong>:"
+msgstr[2] "Následujících {0} pluginů bylo staženo <strong>úspěšně</strong>:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:86
@@ -12143,12 +12156,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Ulice"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Naměřené hodnoty"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -12878,5 +12889,5 @@
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
 msgid "Image Files"
-msgstr ""
+msgstr "Soubory obrázků"
 
 #: ../core/src/org/openstreetmap/josm/io/JpgImporter.java:23
@@ -13692,6 +13703,7 @@
 msgid_plural ""
 "The following plugins are no longer necessary and have been deactivated:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Následující plugin již není potřeba a byl deaktivován:"
+msgstr[1] "Následující pluginy již nejsou potřeba a byly deaktivovány:"
+msgstr[2] "Následující pluginy již nejsou potřeba a byly deaktivovány:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
@@ -13815,6 +13827,7 @@
 msgid "JOSM could not find information about the following plugin:"
 msgid_plural "JOSM could not find information about the following plugins:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "JOSM nemůže nalézt informace o následujícím pluginu:"
+msgstr[1] "JOSM nemůže nalézt informace o následujících pluginech:"
+msgstr[2] "JOSM nemůže nalézt informace o následujících pluginech:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:531
@@ -13839,6 +13852,7 @@
 msgid "Updating the following plugin has failed:"
 msgid_plural "Updating the following plugins has failed:"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Aktualizace následujícího pluginu selhala:"
+msgstr[1] "Aktualizace následujících pluginů selhala:"
+msgstr[2] "Aktualizace následujících pluginů selhala:"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
@@ -14476,6 +14490,7 @@
 msgstr "Nahrát trasy na server"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Viditelnost"
@@ -14566,5 +14581,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolace adres"
@@ -14751,5 +14766,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14790,19 +14805,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budovy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14810,5 +14825,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14821,10 +14836,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Vybrat Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14868,7 +14883,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Cache soubor pro Lambertovu zónu 4 (.4)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15016,5 +15030,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16779,5 +16793,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:64
 msgid "Image files"
-msgstr ""
+msgstr "Soubory obrázků"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/NewLayerFromFileAction.java:73
@@ -16880,5 +16894,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Hromadná doprava"
@@ -16930,5 +16944,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Silniční body"
@@ -17499,4 +17513,6 @@
 "relation representing this turn restriction."
 msgstr ""
+"V následující tabulce můžete upravovat <strong>tagy</strong> OSM relace "
+"reprezentující toto pravidlo."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
@@ -17504,4 +17520,24 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
+msgstr ""
+"V následující tabulce můžete upravovat <strong>členy</strong> OSM relace "
+"reprezentující toto pravidlo."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Typ"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Z ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
 msgstr ""
 
@@ -17662,10 +17698,25 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Vytvořit nové pravidlo odbočování"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Vytvořit nové pravidlo odbočování"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
 msgid "{0} warning"
 msgid_plural "{0} warnings"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} varování"
+msgstr[1] "{0} varování"
+msgstr[2] "{0} varování"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:847
@@ -17673,10 +17724,11 @@
 msgid "{0} error"
 msgid_plural "{0} errors"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "{0} chyba"
+msgstr[1] "{0} chyby"
+msgstr[2] "{0} chyb"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:860
 msgid "no issues"
-msgstr ""
+msgstr "žádné potíže"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:147
@@ -17699,5 +17751,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220
 msgid "Create new turn restriction"
-msgstr ""
+msgstr "Vytvořit nové pravidlo odbočování"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221
@@ -17707,29 +17759,29 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11
 msgid "No Right Turn"
-msgstr ""
+msgstr "Zákaz odbočení vpravo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:12
 msgid "No Left Turn"
-msgstr ""
+msgstr "Zákaz odbočení vlevo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:13
 msgid "No U-Turn"
-msgstr ""
+msgstr "Zákaz otáčení"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:14
 msgid "No Straight On"
-msgstr ""
+msgstr "Přikázaný směr jízdy vlevo nebo vpravo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:15
 msgid "Only Right Turn"
-msgstr ""
+msgstr "Přikázaný směr jízdy vpravo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:16
 msgid "Only Left Turn"
-msgstr ""
+msgstr "Přikázaný směr jízdy vlevo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:17
 msgid "Only Straight On"
-msgstr ""
+msgstr "Přikázaný směr jízdy přímo"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:34
@@ -17740,5 +17792,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
 msgid "please select a turn restriction type"
-msgstr ""
+msgstr "prosím vyberte typ pravidla"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
@@ -17747,24 +17799,26 @@
 "applicable for."
 msgstr ""
+"Vyberte typy vozidel na které se dopravní omezení <strong>NE</"
+"strong>aplikuje."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
 msgid "Public Service Vehicles"
-msgstr ""
+msgstr "Hromadná doprava"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
 msgid "Public service vehicles like buses, tramways, etc."
-msgstr ""
+msgstr "Hromadná doprava jako autobusy, tramvaje atd."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
 msgid "Heavy Goods Vehicles"
-msgstr ""
+msgstr "Nákladní vozidla"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108
 msgid "Motorcars"
-msgstr ""
+msgstr "Osobní automobily"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122
 msgid "Bicycles"
-msgstr ""
+msgstr "Kola"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
@@ -17872,4 +17926,6 @@
 "www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
+"Vývoj pluginu turn restriction sponzoroval <a href=\"http://www.skobbler.de"
+"\">skobbler GmbH</a>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:96
@@ -17879,5 +17935,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:97
 msgid "Sponsor"
-msgstr ""
+msgstr "Sponzor"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
@@ -17898,13 +17954,13 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
 msgid "Road signs - Set A"
-msgstr ""
+msgstr "Značky - sada A"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
 msgid "Road signs - Set B"
-msgstr ""
+msgstr "Značky - sada B"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
 msgid "Please select the set of road sign icons to be used in the plugin."
-msgstr ""
+msgstr "Prosím vyberte si sadu ikon, které bude plugin používat."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
@@ -17920,14 +17976,16 @@
 "creating/editing a turn restriction from the current JOSM selection."
 msgstr ""
+"Zde nastavte <strong>klávesovou zkratku</strong> která bude startovat "
+"vytváření/úpravy pravidel průjezdu křižovatkou."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
 msgctxt "keyboard-key"
 msgid "Key:"
-msgstr ""
+msgstr "Klávesa:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
 msgctxt "keyboard-modifiers"
 msgid "Modifiers:"
-msgstr ""
+msgstr "Modifikátory:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:78
@@ -18110,8 +18168,11 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"Cesta v  OSM <span class=\"object-name\">{0}</span> s rolí <tt>{1}</tt> by "
+"měla být rozdělena v bodě <span class=\"object-name\">{2}</span> kde je "
+"napojena na cestu <span class=\"object-name\">{3}</span>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
 msgid "Split now"
-msgstr ""
+msgstr "Rozdělit teď"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
@@ -18417,5 +18478,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19739,7 +19800,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Číslo"
@@ -19756,5 +19817,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Jízdních pruhů"
@@ -19772,4 +19833,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19777,9 +19839,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. rychlost (km/h)"
@@ -19807,15 +19868,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19826,11 +19881,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Jednosměrka"
@@ -19850,15 +19904,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19875,11 +19927,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19900,8 +19952,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19919,11 +19971,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunel"
@@ -19943,6 +19995,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19960,11 +20012,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Zářez"
@@ -19984,6 +20036,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20001,11 +20053,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Násep"
@@ -20143,5 +20195,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -20150,12 +20202,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20163,13 +20218,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Šířka (metrů)"
@@ -20198,24 +20253,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Povrch"
@@ -20227,5 +20278,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20239,11 +20290,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "zpevněný"
@@ -20251,10 +20301,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "nezpevněný"
@@ -20262,10 +20312,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asfalt"
@@ -20273,11 +20323,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "beton"
@@ -20285,10 +20334,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "kov"
@@ -20296,10 +20345,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "Prales"
@@ -20307,10 +20356,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "dlažební kostky"
@@ -20318,11 +20367,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "dlažební kostky"
@@ -20330,10 +20378,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "štěrk"
@@ -20341,10 +20389,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "oblázky"
@@ -20352,10 +20400,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "zhutněná"
@@ -20363,10 +20411,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20374,10 +20422,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "tráva"
@@ -20385,10 +20433,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "písek"
@@ -20396,10 +20444,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "země"
@@ -20480,6 +20528,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámý typ)"
@@ -20488,5 +20535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Upravit cestu neznámého typu"
@@ -20494,6 +20541,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Komunikace ve výstavbě"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Upravit silnici ve stavbě"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Križovatka"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "kruhový objezd"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Silniční omezení"
@@ -20502,15 +20578,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Upravit silniční omezení"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Poplatek"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá komunikace"
@@ -20518,5 +20594,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Přístup"
@@ -20558,28 +20634,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ano"
@@ -20592,10 +20667,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20609,10 +20684,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20636,97 +20711,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "na povolení"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "zemědelská vozidla"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "ne"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "vyhrazený(preferovaný)"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Zásobování"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladní vozidlo"
@@ -20741,10 +20816,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Kůň"
@@ -20760,10 +20835,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocykl"
@@ -20778,19 +20853,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Vozidla MHD"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. rychlost (km/h)"
@@ -20798,20 +20873,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnost (tun)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. výška (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. šířka (metrů)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. délka (metrů)"
@@ -20819,5 +20894,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Kruhový objezd"
@@ -20828,5 +20903,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Upravit křižovatku"
@@ -20846,10 +20921,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dálnice"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "Dálnice - nájezd"
@@ -20871,10 +20946,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "čtyřproudá silnice"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "čtyřproudá silnice - nájezd"
@@ -20896,10 +20971,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "silnice první třídy"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "Silnice 1. třídy - nájezd"
@@ -20921,5 +20996,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20934,9 +21009,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "silnice třetí třídy"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "silnice bez klasifikace"
@@ -20950,9 +21025,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "obytná oblast"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "obytná zóna"
@@ -20982,10 +21057,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "obslužná cesta"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "Autobusová dráha"
@@ -21015,5 +21090,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21025,10 +21100,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Edituj most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Upravit tunel"
@@ -21036,39 +21111,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Cesty"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Komunikace ve výstavbě"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Upravit silnici ve stavbě"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Križovatka"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "kruhový objezd"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Lesní/polní cesta (track)"
@@ -21077,73 +21123,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Upravit vozovou cestu"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "turistická"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Pěšina, vychozená cesta pro pěší/cyklo (path)"
@@ -21152,38 +21166,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Upravit cestu"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "turistická"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "pro středně pokročilé (červená)"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Sněžný skůtr"
@@ -21192,5 +21236,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Stezka pro koně"
@@ -21198,5 +21242,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Upravit cestu pro koně"
@@ -21204,5 +21248,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Cyklostezka"
@@ -21220,11 +21264,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Upravit cyklostezku"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -21232,5 +21276,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Stezka pro pěší a cyklisty - dělená"
@@ -21238,5 +21282,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Stezka pro pěší a cyklisty - smíšená"
@@ -21244,5 +21288,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Chodník, pěší stezka"
@@ -21251,15 +21295,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Upravit chodník nebo stezku"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Schody"
@@ -21269,10 +21309,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Upravit schody"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Dálniční sjezd (exit)"
@@ -21280,15 +21320,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Upravit křižovatku dálnic"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Služby motoristům (odpočívadla)"
@@ -21296,5 +21336,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Upravit služby motoristům (odpočívadla)"
@@ -21334,17 +21374,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operátor"
@@ -21353,5 +21393,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Semafory"
@@ -21361,5 +21401,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Typ přechodu pro chodce"
@@ -21368,27 +21408,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "volný"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "světelná signalizace"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "ostrov"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Přechod na koni"
@@ -21396,6 +21436,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Přechod na kole"
@@ -21404,11 +21444,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Dohled nad přechodem"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Typ přechodu (UK)"
@@ -21416,30 +21456,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra (bez semaforů)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelikán (se semafory)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "tukan (se semafory a tlačítkem pro chodce a cyklisty)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "papuchalk"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegas (se semafory a tlačítkem pro chodce, cyklisty a jezdce na koni)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tygr"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21447,5 +21487,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Přechod pro chodce"
@@ -21454,14 +21494,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Upravit přechod"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Jméno typu (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Zpomalovací retardér"
@@ -21469,33 +21509,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Upravit zpomalovací retardér"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21503,5 +21543,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21509,5 +21549,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objezd"
@@ -21518,14 +21558,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Směr"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "po směru hodinových ručiček"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Obratiště"
@@ -21535,5 +21575,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Značka hranice sídla (rychlostní limit)"
@@ -21541,15 +21581,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Upravit značka hranice sídla (rychlostní limit)"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Druhé jméno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Rychlostní radar"
@@ -21558,5 +21598,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Nouzový telefon"
@@ -21564,5 +21604,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Stoupání"
@@ -21570,5 +21610,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Prudké stoupání"
@@ -21576,5 +21616,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Zásobník písku (pro posyp)"
@@ -21584,10 +21624,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Upravit brod"
@@ -21595,5 +21635,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Horský průsmyk"
@@ -21601,5 +21641,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Upravit horský průsmyk"
@@ -21611,7 +21651,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Nadmořská výška"
@@ -21619,5 +21659,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Bariéry"
@@ -21625,5 +21665,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Sloupek"
@@ -21631,5 +21671,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Upravit sloupek"
@@ -21674,16 +21714,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Povolený provoz:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Zábrana proti kolům"
@@ -21692,5 +21732,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Zátarasa"
@@ -21698,5 +21738,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Mříž proti dobytku"
@@ -21704,10 +21744,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Editovat mříž proti dobytku"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Zábrana průjezdná pouze autobusem"
@@ -21715,15 +21755,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Jednosměrné hroty"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Editovat jednosměrné hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Mýtná budka"
@@ -21731,5 +21771,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Upravit mýtnou budku"
@@ -21737,10 +21777,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Hraniční kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Upravit hraniční kontrolu"
@@ -21750,5 +21790,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Živý plot"
@@ -21759,22 +21799,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Plot"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Zeď"
@@ -21782,5 +21822,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Městské hradby"
@@ -21789,5 +21829,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Opěrná zeď"
@@ -21799,10 +21839,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Upravit vstup"
@@ -21810,5 +21850,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Brána"
@@ -21816,50 +21856,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Editovat bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Závora"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Upravit závoru"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Editovat odstranitelný díl plotu"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Brána otevíratelná nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Editovat bránu otevíratelnou nárazníkem vozidla"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Editovat průchod v ohrazení s ostrou zatáčkou"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Schůdky přes ohrazení"
@@ -21867,25 +21907,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Editovat schůdky přes ohrazení"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Upravit turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Průchod se dvěma vraty"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Upravit průchod se dvěma vraty"
@@ -21896,11 +21936,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vodstvo"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Pramen"
@@ -21908,5 +21948,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Upravit pramen"
@@ -21914,5 +21954,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Odvodňovací kanál, meliorace"
@@ -21920,10 +21960,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Editovat odvodňovací kanál, meliorace"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Strouha"
@@ -21931,10 +21971,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Upravit strouhu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Potok"
@@ -21942,10 +21982,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Upravit potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Plavební kanál"
@@ -21953,10 +21993,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Upravit plavební kanál"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Řeka"
@@ -21966,5 +22006,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Upravit řeku"
@@ -21972,15 +22012,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Upravit vodní plochu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Země (souš)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Upravit plochu země"
@@ -21988,15 +22028,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Vodní nádrž"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Upravit vodní nádrž"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Umělá vodní nádrž"
@@ -22004,15 +22044,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Upravit umělou vodní plochu"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Krytá vodní nádrž"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Upravit zakrytou umělou vodní plochu"
@@ -22020,5 +22060,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Břeh řeky"
@@ -22027,10 +22067,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Upravit břeh řeky"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Mokřina"
@@ -22041,14 +22081,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Upravit mokřinu"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "bažina"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "močál"
@@ -22062,35 +22102,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "mokřina"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "rákosiny"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "slanisko"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "přílivová oblast"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Bahno"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Upravit bahno"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Pláž"
@@ -22098,20 +22138,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Upravit pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Zátoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Upravit zátoku"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Útes"
@@ -22119,10 +22159,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Upravit útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Linie pobřeží"
@@ -22130,5 +22170,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Upravit linii pobřeží"
@@ -22136,5 +22176,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Přívoz"
@@ -22142,5 +22182,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Upravit přívoz"
@@ -22149,5 +22189,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "doky"
@@ -22155,10 +22195,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Upravit doky"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dok"
@@ -22166,5 +22206,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Upravit dok"
@@ -22172,5 +22212,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Hráz přehrady"
@@ -22178,15 +22218,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Upravit přehradu"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vodní objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Plavební komora"
@@ -22195,5 +22235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Jez"
@@ -22201,20 +22241,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Upravit jez"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Upravit vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Rožšířené místo pro otáčení lodí"
@@ -22223,15 +22263,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Přístav"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Upravit přístav"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Molo"
@@ -22239,10 +22279,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Upravit molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Přístaviště přívozu"
@@ -22250,10 +22290,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Upravit přístaviště přivozu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Skluz v loděnici"
@@ -22263,20 +22303,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Upravit skluz v loděnici"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Doprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Železnice"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Železnice"
@@ -22284,5 +22324,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Upravit železnici"
@@ -22312,86 +22352,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standardní"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22403,8 +22368,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22418,29 +22383,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "seřazovací kolej"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "paralelní pomocná dráha"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "vlečka"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22453,8 +22418,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22525,8 +22490,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22538,8 +22503,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Napětí"
@@ -22552,8 +22517,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22566,23 +22531,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnice"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upravit úzkorozchodnou železnici"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22590,50 +22555,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Upravit monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Historická trať"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Upravit historickou trať"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Krátká/lehká trať"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Upravit krátká/lehká trať"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Upravit metro"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tramvaj"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Upravit tramvaj"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Autobusová dráha"
@@ -22641,5 +22606,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Upravit autobusovou dráhu"
@@ -22648,10 +22613,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnice"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Upravit nepoužívanou železnici"
@@ -22660,9 +22625,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Volitelné typy"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Snesená železnice (pouze žel. spodek)"
@@ -22671,5 +22636,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Železniční přejezd"
@@ -22678,5 +22643,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Železniční přechod pro chodce"
@@ -22686,5 +22651,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Druh křížení"
@@ -22692,5 +22657,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Točna"
@@ -22699,5 +22664,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22706,10 +22671,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Lanovky"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -22717,10 +22682,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Upravit sedačkovou lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Lyžařský vlek"
@@ -22728,10 +22693,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Upravit lyžařský vlek"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Kyvadlová kabinková lanovka"
@@ -22739,10 +22704,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Upravit kyvadlovou kabinkovou lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Oběžná kabinková lanovka"
@@ -22750,10 +22715,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Upravit oběžnou kabinkovou lanovku"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22762,5 +22727,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22768,5 +22733,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22775,5 +22740,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22781,5 +22746,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Čerpací stanice"
@@ -22789,62 +22754,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Upravit čerpací stanici"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22902,32 +22867,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Otevírací doba"
@@ -22986,165 +22951,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pá 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Út-Ne 08:00-15:00; So 08:00-12:00"
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -23161,5 +23126,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23169,5 +23134,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Upravit parkoviště"
@@ -23178,25 +23143,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Číslo záchodu"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "vícepodlažní"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "povrchové"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podzemní"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Parkoviště P+R"
@@ -23205,48 +23170,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Poplatek"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Kapacita (celkem)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Místa pro vozíčkáře"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Myčka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Upravit myčku aut"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Opravna"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Upravit autoopravnu"
@@ -23254,5 +23219,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Půjčovna"
@@ -23261,10 +23226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Upravit půjčovnu aut"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Sdílené vlastnictví vozidel"
@@ -23272,5 +23237,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "̈́Upravit sdílené vlastnictví vozidel"
@@ -23278,10 +23243,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Upravit parkoviště pro kola."
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapacita"
@@ -23290,10 +23255,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Upravit půjčovnu kol"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23303,5 +23268,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23309,5 +23274,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -23315,5 +23280,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Vlaková zastávka"
@@ -23321,5 +23286,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Upravit železniční zastávku"
@@ -23327,5 +23292,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Tramvajová zastávka"
@@ -23334,5 +23299,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Upravit tramvajovou zastávku"
@@ -23340,5 +23305,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Kolejové nástupiště (tram/vlak)"
@@ -23347,5 +23312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Upravit kolejové nástupiště (tram/vlak)"
@@ -23357,5 +23322,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Číslo nástupiště"
@@ -23363,10 +23328,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Označit jako plochu"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -23375,10 +23340,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Upravit vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Invalidní vozík"
@@ -23387,5 +23352,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Autobusové nádraží"
@@ -23394,5 +23359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Upravit autobusové nádraží"
@@ -23400,5 +23365,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Zastávka autobusu"
@@ -23408,5 +23373,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Upravit zastávku autobusu"
@@ -23415,6 +23380,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Přístřešek"
@@ -23422,19 +23387,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Nástupiště autobusu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Upravit nástupiště autobusu"
@@ -23442,5 +23407,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Stanoviště taxi"
@@ -23448,5 +23413,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Upravit stanoviště taxi"
@@ -23454,10 +23419,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Letiště"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23465,5 +23430,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23471,10 +23436,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23483,5 +23448,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Přistávací dráha (runway)"
@@ -23489,5 +23454,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Upravit přistávací dráhu"
@@ -23495,5 +23460,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Pojížděcí dráha (taxiway)"
@@ -23501,5 +23466,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Upravit pojížděcí dráhu"
@@ -23507,5 +23472,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23513,5 +23478,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23521,5 +23486,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Letištní plocha"
@@ -23529,5 +23494,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23538,6 +23503,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Vodní bój"
@@ -23547,5 +23512,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Větrný pytel"
@@ -23554,5 +23519,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23560,5 +23525,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23566,15 +23531,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Cestování"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Ubytování"
@@ -23586,5 +23551,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23593,15 +23558,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Upravit hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Počet hvězdiček"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23609,20 +23574,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Upravit motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Penzion"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Upravit penzion"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Horská chata"
@@ -23630,10 +23595,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Upravit horskou chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostel"
@@ -23641,30 +23606,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Upravit hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Horská bouda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Upravit vysokohorskou boudu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Upravit autokemping (karavany)"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Tábořiště"
@@ -23672,10 +23637,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Upravit tábořiště"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Jídlo a pití"
@@ -23686,5 +23651,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurace"
@@ -23692,5 +23657,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Upravit restauraci"
@@ -23698,5 +23663,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Kuchyně"
@@ -23704,73 +23669,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "čínská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "řecká"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "německá"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "místní"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asijská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Rychlé občersvení"
@@ -23778,17 +23743,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Upravit rychlé občerstvení"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kavárna"
@@ -23796,9 +23761,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Upravit kavárnu"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Hospoda"
@@ -23806,18 +23771,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Upravit hospodu"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Hospoda-zahrádka"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Upravit hospoda-zahrádka"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -23825,9 +23790,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Upravit bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Noční klub"
@@ -23835,24 +23800,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Upravit noční klub"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Atrakce"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Upravit atrakci"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Muzeum"
@@ -23860,9 +23825,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Upravit muzeum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -23871,9 +23836,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Upravit zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Vyhlídka"
@@ -23881,24 +23846,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Upravit vyhlídku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Vyhlídková věž"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Zábavní park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Upravit zábavní park"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Umělecké dílo"
@@ -23906,5 +23871,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Upravit umělecké dílo"
@@ -23912,19 +23877,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Turistické informační centrum"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Přehledová mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Úroveň detailů"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topografická"
@@ -23962,5 +23927,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23968,28 +23933,28 @@
 msgstr "ulice"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "orientační"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Zobrazený areál"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "místo"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "město"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -23999,5 +23964,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Trasy zobrazeny pro:"
@@ -24005,5 +23970,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "turistická stezka"
@@ -24011,6 +23976,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -24018,5 +23983,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Jízda na horském kole"
@@ -24024,6 +23989,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Lyžování"
@@ -24031,5 +23996,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Jízda na koni"
@@ -24037,46 +24002,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Informační nástěnka"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Obsah tabule"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "upozornění"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "informace o historii"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "informace o přírodě"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "informace o divokých zvířatech"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Rozcestník"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Informační terminál"
@@ -24084,29 +24049,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audioprůvodce"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audioprůvodce přes mobilní telefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Telefonní číslo"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Jiný informační bod"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Upravit přístřešek"
@@ -24114,25 +24079,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Ohniště"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Místo na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Upravit místo na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historická místa"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Zámek/Hrad"
@@ -24141,19 +24106,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Upravit zámek/hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Zřícenina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Upravit zříceninu"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Archeologické naleziště"
@@ -24162,9 +24127,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Upravit archeologické naleziště"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Bojiště"
@@ -24172,10 +24137,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Upravit bojiště"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Paleontologické naleziště"
@@ -24183,5 +24148,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Upravit paleontologické naleziště"
@@ -24189,15 +24154,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Upravit monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Památník"
@@ -24205,55 +24170,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Upravit památník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kříž"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Upravit kříž"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Boží muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Upravit boží muka"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Hraniční kameny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Upravit hraniční kameny"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Volný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Akvapark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Upravit akvapark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Hřiště"
@@ -24261,35 +24226,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Upravit hřiště"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Rybaření"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Upravit rybaření"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sportovní potřeby"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportovní zařízení"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Upravit stadion"
@@ -24303,6 +24268,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vyberte sport:"
@@ -24694,6 +24659,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24727,225 +24692,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "kombinovaný"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lukostřelba"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australský fotbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanoistika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Horolezení"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cyklistika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "závody psů"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "krasojízda"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "dostihy"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motoristické sporty"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota (míčová hra)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "pálkové (raketové) sporty"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "střelba"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "bruslení"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "lyžování"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plavání"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "stolní tenis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportovní centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Upravit sportovní centrum"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Hřiště"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Upravit hřiště"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Závodní trať"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Upravit závodní trať"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfové hřiště"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Upravit golfové hřiště"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Upravit minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Kombinováné"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Upravit kombinované"
@@ -24984,21 +24949,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "typ"
@@ -25037,203 +25002,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "hřiště"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sportovní centrum"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Upravit bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Upravit atletiku"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lukostřelba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Upravit lukostřelbu"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Horolezení"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Upravit horolezení"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Upravit kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Upravit cyklistiku"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Závody psů"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Upravit závody psů"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Krasojízda"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Upravit krasojízdu"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Upravit dostihy"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Upravit gymnastiku"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorové sporty"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Upravit motorové sporty"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Bruslení"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Upravit bruslení"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Upravit Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plavání"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Upravit plavání"
@@ -25241,52 +25206,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Upravit lyžování"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Typ sjezdovky"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Sjezdovka"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Běžecká trať"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow park"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Obtížnost"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "pro začátečníky (zelená)"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "jednoduchá (modrá)"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "pro zkušené (černá)"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "pro experty (oranžová)"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "volný terén - freeride (žlutá)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Střelba"
@@ -25294,177 +25259,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Upravit střelbu"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (míčové hry)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Fotbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Upravit fotbal"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australský fotbal"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Upravit australský fotbal"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Upravit baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Upravit basketbal"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Upravit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfové hřiště"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Hry s koulemi (např. pétanque)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Upravit hry s koulemi (např. pétanque)"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Upravit Bowls"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Upravit kriket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Ohražené místo pro tréning kriketu"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Upravit ohražené místo pro tréning kriketu"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Upravit kroket"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Upravit hokej"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota (míčová hra)"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Upravit pelotu (míčová hra)"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Pálkové (raketové) sporty"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Upravit pálkové (raketové) sporty"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Upravit ragby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Stolní tenis (ping-pong)"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Upravit stolní tenis (ping-pong)"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Upravit tenis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Objekty a další POI"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Budova"
@@ -25472,5 +25437,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Veřejná budova"
@@ -25478,10 +25443,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Upravit veřejnou budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Radnice"
@@ -25489,10 +25454,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Upravit radnici"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambasáda"
@@ -25500,10 +25465,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Upravit ambasádu"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Soud"
@@ -25512,10 +25477,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Upravit soud"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vězení"
@@ -25524,10 +25489,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Upravit vězení"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policie"
@@ -25537,10 +25502,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Upravit policii"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Hasičská stanice"
@@ -25549,10 +25514,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Upravit hasičskou stanici"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -25560,5 +25525,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Upravit poštu"
@@ -25566,15 +25531,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Mateřská škola"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Upravit mateřskou školu"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Základní škola"
@@ -25582,10 +25547,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Upravit školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Vysoká škola"
@@ -25593,10 +25558,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Upravit vysokou školu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Střední škola"
@@ -25604,5 +25569,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Upravit střední školu"
@@ -25610,5 +25575,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -25617,10 +25582,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Upravit kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knihovna"
@@ -25629,9 +25594,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Upravit knihovnu"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Komunitní umělecké centrum"
@@ -25639,10 +25604,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Upravit komunitní umělecké centrum"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Divadlo"
@@ -25651,10 +25616,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Upravit divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Chrám(kostel, synagoga, mešita)"
@@ -25664,5 +25629,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Upravit chrám"
@@ -25671,6 +25636,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Náboženství"
@@ -25679,66 +25644,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahá'í"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budhistické"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "křesťanské"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindské"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "džinistické"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "židovské"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muslimské"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualistické"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoistické"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "Unitářské"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastristické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Vyznání"
@@ -25747,81 +25712,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikánské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptistické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katolické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "svědkové Jehovovi"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luteránské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodistické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormonské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "pravoslavné"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentekostalistické"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyteriánské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestantské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "kvakerské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "ší'itské"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnitské"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -25830,5 +25795,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Upravit informace o adrese"
@@ -25836,5 +25801,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Číslo domu"
@@ -25842,25 +25807,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Jméno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Jméno města"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštovní směrovací číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kód země"
@@ -25869,5 +25834,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Upravit interpolaci adres"
@@ -25875,61 +25840,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schéma číslování"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "liché"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "sudé"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "abecední"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Inženýrské objekty"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Továrna"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Upravit továrnu"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Věž"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Upravit věž"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Typ věže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "telekomunikační"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "pozorovací"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Výška (metrů)"
@@ -25937,25 +25902,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Upravit vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Plynojem"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Upravit plynojem"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Maják"
@@ -25963,10 +25928,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Upravit maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Větrný mlýn"
@@ -25974,10 +25939,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Upravit větrný mlýn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Potrubí"
@@ -25986,41 +25951,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Upravit potrubí"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "teplo"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "ropa"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "kanalizace"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Umístění"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "podvodní"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "nadzemní"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistička odpadních vod"
@@ -26030,10 +25995,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Upravit čističku odpadních vod"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Jeřáb"
@@ -26041,5 +26006,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Upravit jeřáb"
@@ -26047,10 +26012,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editovat vodní bój"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Triangulační bod"
@@ -26058,10 +26023,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Upravit triangulační bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Sledovací kamera"
@@ -26069,23 +26034,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Upravit sledovací kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Elektrárna"
@@ -26095,35 +26060,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Upravit elektrárnu"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "větrná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vodní"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fosilní paliva"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "jaderná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "uhelná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "sluneční"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Rozvodna"
@@ -26132,10 +26097,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Upravit rozvodnu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Trafostanice"
@@ -26144,5 +26109,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Upravit trafostanici"
@@ -26150,10 +26115,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Číslo vedení"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Stožár elektrického vedení"
@@ -26164,23 +26129,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Upravit stožár elektrického vedení"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "věž"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "stožár"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Dráty elektrického vedení"
@@ -26189,74 +26154,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Upravit dráty elektrického vedení"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Typ vedení"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "vedení"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "vedlejší vedení"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Počet kabelů"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet drátů (nebo lépe vodičů) na každém kabelu"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "jednoduchý"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "dvojitý"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "trojitý"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "čtveřitý"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Občanská vybavenost"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Záchody"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Poštovní schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -26265,5 +26230,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Upravit telefon"
@@ -26271,5 +26236,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mince"
@@ -26277,5 +26242,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Bankovky"
@@ -26283,5 +26248,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronické peněženky nebo kreditní karty."
@@ -26289,5 +26254,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debetní karty"
@@ -26295,15 +26260,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditní karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonní karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recyklační stanoviště"
@@ -26312,5 +26277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Upravit recyklační stanoviště"
@@ -26318,35 +26283,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Oblečení"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Kovový šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Odpadkový koš"
@@ -26354,5 +26319,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Upravit odpadkový koš"
@@ -26361,31 +26326,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Opěrka zad"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "kámen"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Barva"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "černá"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "hnědá"
@@ -26464,5 +26429,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26472,31 +26437,31 @@
 msgstr "zeleň"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "bílá"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Počet sedadel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Upravit posed"
@@ -26505,30 +26470,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "nízká"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "střední"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "plná"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Úkryt"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Uzamknutelný"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontána"
@@ -26537,10 +26502,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Upravit fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -26549,10 +26514,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Upravit pitnou vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Požární hydrant"
@@ -26561,5 +26526,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Upravit požární hydrant"
@@ -26567,5 +26532,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Babybox"
@@ -26573,15 +26538,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Upravit babybox"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Prodejce automobilů"
@@ -26589,10 +26554,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Upravit obchod s auty"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Prodejce kol"
@@ -26601,28 +26566,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Upravit prodejnu kol"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Upravit supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Upravit drogerii"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Samoobsluha, smíšenka, večerka"
@@ -26630,9 +26595,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Upravit večerku"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosek"
@@ -26640,27 +26605,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Upravit kiosek"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Knihkupectví"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Upravit knihkupectví"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Cestovní kancelář"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Upravit cestovní kancelář"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Řeznictví"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Upravit řeznictví"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Pekařství"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Upravit pekařství"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Květinářství"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Upravit květinářství"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Obchod se zdravou výživou"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Upravit obchod se zdravou výživou"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Upravit obchod s alkoholem"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Nápoje"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Upravit obchod s nápoji"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Počítače"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Upravit obchod s počítači"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Upravit obchod s elektronikou"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Upravit obchod s hifi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Nábytek"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Upravit obchod s nábytkem"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Zahradnické centrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Upravit zahradnické centrum"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Železářství"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Upravit železářství"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Zboží pro kutily"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Upravit obchod se zbožím pro kutily"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Papírnictví"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Upravit papírnictví"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Kadeřnictví"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Upravit Kadeřnictví"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Obuv"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Upravit obchod s obuví"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Hračky"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Upravit obchod s hračkami"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Videopůjčovna/prodejna"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Upravit videopůjčovnu/prodejnu"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Čistírna"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Upravit čistírnu"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Prádelna"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Upravit prádelnu"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Vybavení do přírody"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Obchod s vybavením do přírody"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Upravit obchod se sportovními pořebami"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Oční optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Upravit oční optiku"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Prodejní automat"
@@ -26668,5 +26847,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Upravit prodejní automat"
@@ -26674,306 +26853,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Prodávané produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "lístky na městskou hromadnou dopravu"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "plány městské hromadné dopravy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkovací lístky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "jídlo"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "pití"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "krmivo pro zvířata"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefonní karty"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "poukazy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicykl"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondomy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Zůstatkové nebo věrnostní karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Řeznictví"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Upravit řeznictví"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Pekařství"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Upravit pekařství"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Květinářství"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Upravit květinářství"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Obchod se zdravou výživou"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Upravit obchod se zdravou výživou"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Upravit obchod s alkoholem"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Nápoje"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Upravit obchod s nápoji"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Počítače"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Upravit obchod s počítači"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Upravit obchod s elektronikou"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Upravit obchod s hifi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Nábytek"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Upravit obchod s nábytkem"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Zahradnické centrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Upravit zahradnické centrum"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Železářství"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Upravit železářství"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Zboží pro kutily"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Upravit obchod se zbožím pro kutily"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Papírnictví"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Upravit papírnictví"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Kadeřnictví"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Upravit Kadeřnictví"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Obuv"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Upravit obchod s obuví"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Hračky"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Upravit obchod s hračkami"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Videopůjčovna/prodejna"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Upravit videopůjčovnu/prodejnu"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Čistírna"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Upravit čistírnu"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Prádelna"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Upravit prádelnu"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Vybavení do přírody"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Obchod s vybavením do přírody"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Upravit obchod se sportovními pořebami"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Oční optik"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Upravit oční optiku"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Finance"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banka"
@@ -26981,14 +26952,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Upravit banku"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Směnárna"
@@ -26996,5 +26967,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Upravit směnárnu"
@@ -27002,15 +26973,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Upravit bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Zdraví"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Zdavotní středisko, poliklinika"
@@ -27018,18 +26989,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Upravit zdravotní středisko, polikliniku"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Zubař"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Upravit zubařskou ordinaci"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Lékárna"
@@ -27037,5 +27008,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Upravit lékárnu"
@@ -27043,9 +27014,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Vydává léky na předpis"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Nemocnice"
@@ -27053,10 +27024,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Upravit nemocnici"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Místo pro kontaktování záchranářů"
@@ -27065,5 +27036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Upravit místo pro kontaktování záchranářů"
@@ -27072,20 +27043,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Číslo místa"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Jméno místa"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefonní číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použijte mezinárodní zápis, např. +420123456789)"
@@ -27093,5 +27064,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinář"
@@ -27100,64 +27071,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Upravit veterinární ordinaci"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Místa"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Upravit kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Stát"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Upravit stát"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Země"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Upravit zemi"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Kraj"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Upravit kraj"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Okres"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Upravit okres"
@@ -27165,15 +27136,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Velkoměsto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Upravit velkoměsto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Město"
@@ -27181,10 +27152,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Upravit město"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Městský obvod, nebo městská část"
@@ -27192,25 +27163,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Upravit městský obvod, nebo městská část"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Obec"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Upravit obci"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Upravit samotu"
@@ -27218,5 +27189,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Místní název"
@@ -27224,10 +27195,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Editovat místní název"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ostrov"
@@ -27235,10 +27206,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Upravit ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Ostrůvek"
@@ -27246,5 +27217,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Upravit ostrůvek"
@@ -27252,5 +27223,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Vstup do jeskyně"
@@ -27258,10 +27229,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Upravit vstup do jeskyně"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Vrchol"
@@ -27269,10 +27240,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Upravit vrchol"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Ledovec"
@@ -27280,10 +27251,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Upravit ledovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Sopka"
@@ -27291,70 +27262,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Upravit sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Národní"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Upravit národní hranici"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrativní"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Upravit administrativní hranici"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr ""
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr ""
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Volební obvod"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Upravit volební obvod"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Národní park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Upravit hranice národního parku"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Využití krajiny"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Strom"
@@ -27363,15 +27334,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Upravit strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanické jméno"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Prales"
@@ -27380,5 +27351,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Editovat Prales"
@@ -27386,17 +27357,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "jehličnatý"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "smíšený"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Les"
@@ -27405,14 +27376,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Upravit lesní plochu"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Přírodní rezervace"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Upravit přírodní rezervaci"
@@ -27420,25 +27391,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Suťoviště"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Upravit suťoviště"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Podrost"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Upravit podrost"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Travnatá pahorkatina"
@@ -27446,10 +27417,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Upravit travnatou pahorkatinu"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Vřesoviště"
@@ -27457,5 +27428,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Upravit vřesoviště"
@@ -27463,5 +27434,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Farma"
@@ -27470,45 +27441,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Upravit farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Zemědělská půda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Upravit zemědělskou půdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Louka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Upravit louku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vinice"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Upravit vinici"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Zahrádkářská kolonie"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Upravit zahrádkářskou kolonii"
@@ -27516,25 +27487,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Zahrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Upravit zahradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Upravit travnatou plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Zelená plocha"
@@ -27542,10 +27513,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Upravit zelenou plochu"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "veřejná zeleň (mimo parky)"
@@ -27553,20 +27524,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Upravit veřejnou zeleň"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Upravit park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Rekreační plocha"
@@ -27574,5 +27545,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upravit rekreační plochu"
@@ -27580,15 +27551,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Obytná plocha"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Upravit obytnou plochu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Malý hřbitov"
@@ -27596,9 +27567,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Upravit malý hřbitov"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Hřbitov"
@@ -27606,39 +27577,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Upravit hřbitov"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Obchody"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Upravit plochu s obchody"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Kanceláře"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Upravit kancelářskou plochu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Průmysl"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Upravit průmyslovou plochu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Železniční plocha"
@@ -27646,15 +27617,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Upravit železniční plochu"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Vojenský prostor"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Upravit vojenský prostor"
@@ -27662,50 +27633,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Probíhající výstavba"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Upravit výstavbu"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Stará zátěž, městské ruiny (Brownfield)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Upravit starou zátěž (Brownfield)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Upravit zastavitelné území (Greenfield)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "skládka odpadu"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Upravit skládku odpadu"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Upravit lom"
@@ -27715,5 +27686,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Upravit multipolygon"
@@ -27722,10 +27693,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "vnější část"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "vnitřní část"
@@ -27733,5 +27704,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Zákaz odbočení"
@@ -27740,5 +27711,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Upravit zákaz odbočení"
@@ -27746,34 +27717,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Omezení"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "zákaz odbočení vlevo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "zákaz odbočení vpravo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "zákaz jízdy rovně"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "zákaz otáčení"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "pouze odbočení vpravo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "pouze odbočení vlevo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "pouze jízda rovně"
@@ -27782,15 +27753,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "přes uzel nebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "na cestu"
@@ -27798,5 +27769,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Trasa"
@@ -27805,5 +27776,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Upravit trasu"
@@ -27811,5 +27782,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Typ trasy"
@@ -27900,5 +27871,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27908,17 +27879,17 @@
 msgstr "bicykl"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "silnice"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "trajekt"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "lyžařská"
@@ -27978,5 +27949,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27985,9 +27956,9 @@
 msgstr "pěší"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tramvajová"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "objízdná"
@@ -28001,10 +27972,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Popis symbolu"
@@ -28012,31 +27983,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Síť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "navrhovaná"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternativní"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "dočasná"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "spojení"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Barva (hex)"
@@ -28045,32 +28016,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "segment trasy"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "dopředný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "zpětný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "zastávka"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "dopředná zastávka"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "zpětná zastávka"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standardní"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/da.po
===================================================================
--- /applications/editors/josm/i18n/po/da.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/da.po	(revision 20945)
@@ -9,6 +9,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-12 11:33+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:21+0000\n"
 "Last-Translator: Søren <shkristensen@gmail.com>\n"
 "Language-Team: Dansk <kde-i18n-doc@kde.org>\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1202,5 +1202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter udenfor verden."
@@ -1522,5 +1522,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2291,9 +2291,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2376,26 +2376,26 @@
 msgstr "Afslut tegning."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Træk ud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Opret områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Træk vej ud"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Flyt et segment langs dets normale og slip så museknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Tegn en firkant af passende størrelse og slip så museknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2417,6 +2417,6 @@
 "at synkronisere lyd på det sted."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2428,9 +2428,9 @@
 msgstr "Markering"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Vælg, flyt og rotér objekter"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2439,17 +2439,17 @@
 msgstr[1] "Tilføj og flyt et virtuelt nyt punkt til {0} veje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Flyt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Flyt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Fortryd flytning"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2462,9 +2462,9 @@
 "Vil du virkelig flytte dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slip museknappen for at vælge objekterne inden i firkanten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2473,9 +2473,9 @@
 "nærmeste punkt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Slip museknappen for at stoppe rotationen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3240,5 +3240,5 @@
 msgstr "Udfør?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3847,17 +3847,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "forbindelse"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Endnu ikke taggede billeder"
+msgstr ""
 
 #. teal
@@ -4040,5 +4037,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "jernbane"
@@ -5371,5 +5368,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -5812,4 +5809,9 @@
 msgstr "Filtertilstand"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5900,5 +5902,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relationer"
@@ -6001,14 +6003,14 @@
 msgstr "Markering: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Frigør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Luk panelet. Du kan genåbne det med knapperne i venstre menubar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik for at minimere/maksimere panelet"
@@ -6349,4 +6351,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6359,10 +6367,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7032,145 +7034,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Navn"
@@ -8452,10 +8454,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Type"
@@ -8463,5 +8465,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8475,17 +8476,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "ukendt"
@@ -9303,11 +9303,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9324,14 +9326,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Lag"
@@ -9903,5 +9905,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Beskrivelse"
@@ -11026,26 +11028,26 @@
 msgstr "Luk dialogen og acceptér adgangsudtrykket"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Advarsel: Kunne ikke annullere kørende OAuth-operation"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Henter OAuth anmodningsudtryk fra ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Henter OAuth adgangsudtryk fra ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "OSM-webside leverede ikke en sessionscookie som svar på ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11054,29 +11056,29 @@
 "bruger"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Autoriserer OAuth anmodningsudtrykket ''{0}'' på OSM-websiden ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Initialiserer en session på OSM-websiden..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Autentificerer sessionen for bruger ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Autoriserer anmodningsudtryk ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11575,5 +11577,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Bil"
@@ -11595,16 +11597,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Cykel"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11634,12 +11637,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Gående"
@@ -12346,17 +12349,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Avancerede OAuth parametre"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Vejnavn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Målte værdier"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14718,6 +14718,7 @@
 msgstr "Upload GPX-spor"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Synlighed"
@@ -14808,5 +14809,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adresse-interpolering"
@@ -14994,5 +14995,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -15033,19 +15034,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15053,5 +15054,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15064,10 +15065,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Vælg Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15111,7 +15112,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert Zone 2 cache-fil (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15253,5 +15253,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17095,5 +17095,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -17145,5 +17145,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Vejpunkter"
@@ -17721,4 +17721,22 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Type"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Fra ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17875,4 +17893,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Slet den redigerede relation"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Markér i relationsliste"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18636,5 +18668,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19986,7 +20018,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Reference"
@@ -20003,5 +20035,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Baner"
@@ -20019,4 +20051,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20024,9 +20057,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Maks. hastighed (km/t)"
@@ -20054,15 +20086,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20073,11 +20099,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Ensrettet"
@@ -20097,15 +20122,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20122,11 +20145,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20147,8 +20170,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20166,11 +20189,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -20190,6 +20213,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20207,11 +20230,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Indhak"
@@ -20231,6 +20254,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20248,11 +20271,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Vold"
@@ -20390,5 +20413,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -20397,12 +20420,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20410,13 +20436,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Bredde (meter)"
@@ -20445,24 +20471,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Overflade"
@@ -20474,5 +20496,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20486,11 +20508,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "brolagt"
@@ -20498,10 +20519,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "ikke brolagt"
@@ -20509,10 +20530,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asfalt"
@@ -20520,11 +20541,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "beton"
@@ -20532,10 +20552,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "metal"
@@ -20543,10 +20563,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "træ"
@@ -20554,10 +20574,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "fliser"
@@ -20565,11 +20585,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "brosten"
@@ -20577,10 +20596,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "grus"
@@ -20588,10 +20607,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "småsten"
@@ -20599,10 +20618,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "kompakteret"
@@ -20610,10 +20629,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "Græs_belægning"
@@ -20621,10 +20640,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "græs"
@@ -20632,10 +20651,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sand"
@@ -20643,10 +20662,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "jord"
@@ -20727,6 +20746,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Vej (ukendt type)"
@@ -20735,5 +20753,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Ret vej af ukendt type"
@@ -20741,6 +20759,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Under udførelse"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Ret vej under udførelse"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Kryds"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rundkørsel"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Adgangsbegrænsninger"
@@ -20749,15 +20796,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Ret adgangsbegrænsninger"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Betalingsanlæg"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Blind vej"
@@ -20765,5 +20812,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Adgang"
@@ -20805,28 +20852,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ja"
@@ -20839,10 +20885,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20856,10 +20902,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20883,97 +20929,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "tilladt"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "landbrug"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "designeret"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Lastbil"
@@ -20988,10 +21034,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Hest"
@@ -21007,10 +21053,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -21025,19 +21071,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorkøretøj"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlig transport"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighed (km/t)"
@@ -21045,20 +21091,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Maks. vægt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Maks. højde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Maks. bredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Maks. længde (meter)"
@@ -21066,5 +21112,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rundkørsel"
@@ -21075,5 +21121,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Ret trafikknudepunkt"
@@ -21093,10 +21139,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorvej"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "motorvejsforbindelse"
@@ -21118,10 +21164,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "motortrafikvej"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "motortrafikvejsforbindelse"
@@ -21143,10 +21189,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primær"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "primær-(til/fra)-kørsel"
@@ -21168,5 +21214,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21181,9 +21227,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiær"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "uklassificeret"
@@ -21197,9 +21243,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "beboelse"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "legegade"
@@ -21229,10 +21275,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "bus-ledevej"
@@ -21262,5 +21308,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21272,10 +21318,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Ret bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Ret en tunnel"
@@ -21283,39 +21329,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Stier"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Under udførelse"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Ret vej under udførelse"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Kryds"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rundkørsel"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Spor"
@@ -21324,73 +21341,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Ret spor"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "vandring"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Sti"
@@ -21399,38 +21384,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Ret sti"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "vandring"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Motorslæde"
@@ -21439,5 +21454,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21445,5 +21460,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Ret ridesti"
@@ -21451,5 +21466,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21467,11 +21482,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Ret cykelsti"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Fodgængere"
@@ -21479,5 +21494,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21485,5 +21500,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21491,5 +21506,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -21498,15 +21513,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Ret gangsti"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Cykler"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Trin"
@@ -21516,10 +21527,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Ret trappetrin"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Motorvejskryds"
@@ -21527,15 +21538,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Ret motorvejskryds"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Motorvejsrasteplads"
@@ -21543,5 +21554,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Ret tankstation"
@@ -21581,17 +21592,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Selskab"
@@ -21600,5 +21611,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Færdselssignal"
@@ -21608,5 +21619,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Type af fodgængerfelt"
@@ -21615,27 +21626,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "ukontrolleret"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "trafik_lys"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "helleanlæg"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "uden markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Overgangssted for ridende"
@@ -21643,6 +21654,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Overkørsel for cykler"
@@ -21651,11 +21662,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21663,30 +21674,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "fodgængerfelt"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "fodgængerfelt med trafikstyring"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21694,5 +21705,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Fodgængerfelt"
@@ -21701,14 +21712,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Ret overkørsel"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21716,33 +21727,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21750,5 +21761,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21756,5 +21767,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-rundkørsel"
@@ -21765,14 +21776,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "med uret"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Vendeplads"
@@ -21782,5 +21793,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Bygrænse"
@@ -21788,15 +21799,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Ret et bygrænse-skilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Andet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Fartkamera"
@@ -21805,5 +21816,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -21811,5 +21822,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Stigning"
@@ -21817,5 +21828,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Stejl stigning"
@@ -21823,5 +21834,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21831,10 +21842,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Ret vadested"
@@ -21842,5 +21853,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Bjergpas"
@@ -21848,5 +21859,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Ret bjergpas"
@@ -21858,7 +21869,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Højde"
@@ -21866,5 +21877,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barrierer"
@@ -21872,5 +21883,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Pæl"
@@ -21878,5 +21889,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Ret en pæl"
@@ -21921,16 +21932,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Tilladt trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Cykelhindring"
@@ -21939,5 +21950,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21945,5 +21956,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Kreaturrist"
@@ -21951,10 +21962,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Ret en kreaturrist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -21962,15 +21973,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Pigge"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Betalingsanlæg"
@@ -21978,5 +21989,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Ret betalingsanlæg"
@@ -21984,10 +21995,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Grænsekontrol"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Ret grænsekontrol"
@@ -21997,5 +22008,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Hæk"
@@ -22006,22 +22017,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Hegn"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Mur"
@@ -22029,5 +22040,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Bymur"
@@ -22036,5 +22047,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -22046,10 +22057,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Indgang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Ret indgang"
@@ -22057,5 +22068,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Port"
@@ -22063,50 +22074,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Ret port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Ret bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Trådled"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Ret trådled"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Skubbeport"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Ret skubbeport"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Stente"
@@ -22114,25 +22125,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Ret en stente"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Udfaldsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Ret en udfaldsport"
@@ -22143,11 +22154,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vand"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Udspring"
@@ -22155,5 +22166,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Ret udspring"
@@ -22161,5 +22172,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Dræn"
@@ -22167,10 +22178,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Ret dræn"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -22178,10 +22189,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Bæk"
@@ -22189,10 +22200,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Ret bæk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -22200,10 +22211,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Ret kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Flod"
@@ -22213,5 +22224,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Ret flod"
@@ -22219,15 +22230,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Ret vand"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Ret land"
@@ -22235,15 +22246,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Bassin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Vandreservoir"
@@ -22251,15 +22262,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Ret område for vandreservoir"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Overdækket reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Ret overdækket reservoir"
@@ -22267,5 +22278,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Flodbred"
@@ -22274,10 +22285,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Ret flodbred"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Vådområde"
@@ -22288,14 +22299,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Ret vådområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Sump"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "mose"
@@ -22309,35 +22320,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsk"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "marskland"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "saltmarsk"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "vadehavsområde"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Mudder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Ret mudder"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strand"
@@ -22345,20 +22356,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Ret strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Bugt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Ret bugt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Klippe"
@@ -22366,10 +22377,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Ret klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -22377,5 +22388,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Ret kystlinje"
@@ -22383,5 +22394,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Færgerute"
@@ -22389,5 +22400,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Ret færge"
@@ -22396,5 +22407,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Værft"
@@ -22402,10 +22413,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Ret værft"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dok"
@@ -22413,5 +22424,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Ret dok"
@@ -22419,5 +22430,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Dæmning"
@@ -22425,15 +22436,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Ret dæmning"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vandvejs-punkt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -22442,5 +22453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Damlukke"
@@ -22448,20 +22459,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Ret stemmeværk"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Vandfald"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Ret vandfald"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -22470,15 +22481,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Lystbådehavn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Ret lystbådehavn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Mole"
@@ -22486,10 +22497,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Ret mole"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Færgehavn"
@@ -22497,10 +22508,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Ret færgehavn"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Slæbested"
@@ -22510,20 +22521,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Ret slæbested"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Spor"
@@ -22531,5 +22542,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Ret spor"
@@ -22559,86 +22570,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22650,8 +22586,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22665,29 +22601,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "Banegård"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "sidespor"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22700,8 +22636,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22772,8 +22708,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22785,8 +22721,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Spænding"
@@ -22799,8 +22735,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22813,23 +22749,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Smalsporet bane"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Ret smalsporet jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22837,50 +22773,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Ret monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Bevaret"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Ret bevaret jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Letbane"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Ret letbane"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Ret metro"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Sporvogn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Ret sporvogn"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Styreskinne til bus"
@@ -22888,5 +22824,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Ret styreskinne til bus"
@@ -22895,10 +22831,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Ubrugt jernbanespor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Ret ubrugt jernbanespor"
@@ -22907,9 +22843,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Valgfri typer"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Fjernet jernbane"
@@ -22918,5 +22854,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Jernbaneoverskæring"
@@ -22925,5 +22861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Fodgængerovergang (over jernbane)"
@@ -22933,5 +22869,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Overgangstype"
@@ -22939,5 +22875,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Drejeskive"
@@ -22946,5 +22882,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22953,10 +22889,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Luftvej"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Skilift"
@@ -22964,10 +22900,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Ret skilift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Træklift"
@@ -22975,10 +22911,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Ret træklift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Tovbane"
@@ -22986,10 +22922,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Ret tovbane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondol"
@@ -22997,10 +22933,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Ret Gondol"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23009,5 +22945,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23015,5 +22951,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23022,5 +22958,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23028,5 +22964,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Brændstof"
@@ -23036,62 +22972,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Ret brændstof"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -23149,32 +23085,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Åbningstider"
@@ -23233,165 +23169,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mandag-Fredag 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -23408,5 +23344,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23416,5 +23352,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Ret parkering"
@@ -23425,25 +23361,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referensenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "fleretages"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "overflade"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Parkér og kør"
@@ -23452,48 +23388,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Handicapplads"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Område for kvinder"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Område for forældre"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Vask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Ret bilvask"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Bilmekaniker"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Ret bilmekaniker"
@@ -23501,5 +23437,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Udlejning"
@@ -23508,10 +23444,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Ret biludlejning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Deling"
@@ -23519,5 +23455,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Ret bildeling"
@@ -23525,10 +23461,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Ret cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -23537,10 +23473,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Ret cykeludlejning"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23550,5 +23486,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23556,5 +23492,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-reference"
@@ -23562,5 +23498,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Jernbane-stop"
@@ -23568,5 +23504,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Ret stop"
@@ -23574,5 +23510,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Sporvogns-stop"
@@ -23581,5 +23517,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Ret sporvogns-stop"
@@ -23587,5 +23523,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Jernbaneplatform"
@@ -23594,5 +23530,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Ret jernbaneplatform"
@@ -23604,5 +23540,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -23610,10 +23546,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Indgang til undergrundsbane"
@@ -23622,10 +23558,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Ret indgang til undergrundsbane"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "kørestol"
@@ -23634,5 +23570,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Rutebilstation"
@@ -23641,5 +23577,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Ret rutebilstation"
@@ -23647,5 +23583,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Busstop"
@@ -23655,5 +23591,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Ret busstop"
@@ -23662,6 +23598,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Læskur"
@@ -23669,19 +23605,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bænk"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Rutebil-platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Ret rutebil-platform"
@@ -23689,5 +23625,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23695,5 +23631,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Ret taxiholdeplads"
@@ -23701,10 +23637,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Lufthavn"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23712,5 +23648,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23718,10 +23654,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23730,5 +23666,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23736,5 +23672,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23742,5 +23678,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23748,5 +23684,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23754,5 +23690,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23760,5 +23696,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23768,5 +23704,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23776,5 +23712,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23785,6 +23721,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Pejlemærke"
@@ -23794,5 +23730,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23801,5 +23737,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23807,5 +23743,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23813,15 +23749,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Rejse"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Overnatning"
@@ -23833,5 +23769,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23840,15 +23776,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Ret hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23856,20 +23792,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Ret motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Gæstehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Ret gæstehus"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Feriehytte"
@@ -23877,10 +23813,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Ret feriehytte"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Vandrerhjem"
@@ -23888,30 +23824,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Ret vandrerhjem"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Ret alpin hytte"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Campingplads"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Camping plads"
@@ -23919,10 +23855,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Ret campingplads"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Mad+drikke"
@@ -23933,5 +23869,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -23939,5 +23875,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Ret restaurant"
@@ -23945,5 +23881,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Køkken"
@@ -23951,73 +23887,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "græsk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexicansk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fastfood"
@@ -24025,17 +23961,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Ret fastfood-restaurant"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Café"
@@ -24043,9 +23979,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Ret café"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -24053,18 +23989,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Ret pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Ret biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24072,9 +24008,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Ret bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Natklub"
@@ -24082,24 +24018,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Ret natklub"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Forlystelse"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Ret forlystelse"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -24107,9 +24043,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Ret museum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24118,9 +24054,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Ret zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Udsigtspunkt"
@@ -24128,24 +24064,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Ret udsigtspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Udkigstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Forlystelsespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Ret forlystelsespark"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Kunstværk"
@@ -24153,5 +24089,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Ret kunstværk"
@@ -24159,19 +24095,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Informationskontor"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -24209,5 +24145,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24215,28 +24151,28 @@
 msgstr "gade"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Vist område"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "sted"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "by"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Nærmere beskrivelse"
@@ -24246,5 +24182,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Ruter vist for:"
@@ -24252,5 +24188,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Vandring"
@@ -24258,6 +24194,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cykling"
@@ -24265,5 +24201,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -24271,6 +24207,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skisport"
@@ -24278,5 +24214,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Ridning"
@@ -24284,46 +24220,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "historie"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "planter"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Guide post"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Informations terminal"
@@ -24331,29 +24267,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Nærmere beskrivelse"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audio guide"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audio guide via mobiletelefon?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Andre informations punkter"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Ret shelter"
@@ -24361,25 +24297,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Bålplads"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picnic sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Ret picnic sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Borg"
@@ -24388,19 +24324,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Ret borg"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Ret ruiner"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Arkæologisk sted"
@@ -24409,9 +24345,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Ret arkæologisk sted"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -24419,10 +24355,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Ret slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Palæontologisk sted"
@@ -24430,5 +24366,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Ret palæontologisk sted"
@@ -24436,15 +24372,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Ret monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mindesmærke"
@@ -24452,55 +24388,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Ret mindesmærke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Vejkantskors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Ret vejkantskors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Ret vejkantstempel"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Grænsesten"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Ret grænsesten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Rekreation"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badeland"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Ret badeland"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Legeplads"
@@ -24508,35 +24444,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Ret legeplads"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskeri"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Ret fiskeri"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportsfaciliteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Ret stadion"
@@ -24550,6 +24486,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vælg sportsgren:"
@@ -24941,6 +24877,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24974,225 +24910,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bueskydning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australsk fodbold"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "petanque"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundeløb"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "amerikansk fodbold"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "travbane"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skydebane"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skisport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fodbold"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "svømning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Idrætscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Ret idrætscenter"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Væddeløbsbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Ret væddeløbsbane"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Ret golfbane"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Ret minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Ret multi"
@@ -25231,21 +25167,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "type"
@@ -25284,203 +25220,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sportshal"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "spor"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Ret bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Ret atletik"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bueskydning"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Ret bueskydning"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Ret klatring"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Ret kanosport"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Ret cykling"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundeløb"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Ret hundeløb"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Ret ridning"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Galopbane"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Ret galopbane"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Ret gymnastik"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Ret motorsport"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Ret skating"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Ret Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Svømning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Ret svømning"
@@ -25488,52 +25424,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Ret skisport"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "styrtløb"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "skiløb"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Sværhedsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "nybegynder"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "let"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanceret"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skydning"
@@ -25541,177 +25477,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Ret skydning"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (bold)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fodbold"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Ret fodbold"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fodbold"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Ret amerikansk fodbold"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australsk fodbold"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Ret australsk fodbold"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Ret Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Ret Basketball"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Ret Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfbane"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Petanque"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Ret petanque"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Ret cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnet"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Ret cricketnet"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Ret kroket"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Ret hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Ret pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Ret rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Ret bordtennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Ret tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Menneskeskabt"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygning"
@@ -25719,5 +25655,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -25725,10 +25661,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Ret offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rådhus"
@@ -25736,10 +25672,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Ret rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -25747,10 +25683,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Ret ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domhus"
@@ -25759,10 +25695,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Ret domhus"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fængsel"
@@ -25771,10 +25707,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Ret fængsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politi"
@@ -25784,10 +25720,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Ret politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -25796,10 +25732,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Ret brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Posthus"
@@ -25807,5 +25743,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Ret posthus"
@@ -25813,15 +25749,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Ret børnehave"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skole"
@@ -25829,10 +25765,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Ret skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universitet"
@@ -25840,10 +25776,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Ret universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Videregående udd."
@@ -25851,5 +25787,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Ret videregående udd."
@@ -25857,5 +25793,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Biograf"
@@ -25864,10 +25800,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Ret biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -25876,9 +25812,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Ret bibliotek"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstcenter"
@@ -25886,10 +25822,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Ret kunstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -25898,10 +25834,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Ret teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Sted for tilbedelse"
@@ -25911,5 +25847,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Ret sted for tilbedelse"
@@ -25918,6 +25854,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -25926,66 +25862,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddhistisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduistisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jainistisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muslimsk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritistisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoistisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitar"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastristisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Trosretning"
@@ -25994,81 +25930,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptistisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Jehovas Vidner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodistisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormonsk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pinsebevægelsen"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "prebyteriansk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestantisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "kvæker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shiitisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnitisk"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -26077,5 +26013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Ret adresseinformation"
@@ -26083,5 +26019,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -26089,25 +26025,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Vejnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Bynavn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landekode"
@@ -26116,5 +26052,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Ret adresse-interpolering"
@@ -26122,61 +26058,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummereringssystem"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "ulige"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "lige"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Menneskeskabt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Ret fabrik"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Ret tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Type af tårn"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "kommunikation"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Højde (meter)"
@@ -26184,25 +26120,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vandtårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Ret vandtårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Ret gasbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -26210,10 +26146,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Ret fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vejrmølle"
@@ -26221,10 +26157,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Ret vejrmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -26233,41 +26169,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Ret rørledning"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "varme"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "olie"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "Spildevand"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Sted"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "undervands"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "på land"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Rensningsanlæg"
@@ -26277,10 +26213,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Ret rensningsanlæg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -26288,5 +26224,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Ret kran"
@@ -26294,10 +26230,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Ret Pejlemærke"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Målepunkt"
@@ -26305,10 +26241,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Ret målepunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Overvågning"
@@ -26316,23 +26252,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Ret overvågningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Generator"
@@ -26342,35 +26278,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Ret generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vand"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "arom"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kul"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "sol"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Kraftværk"
@@ -26379,10 +26315,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Ret kraftværk"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -26391,5 +26327,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Ret transformatorstation"
@@ -26397,10 +26333,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Linie reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Elmast"
@@ -26411,23 +26347,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Ret elmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "tårn"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "stang"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Tårn reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Strømkabel"
@@ -26436,74 +26372,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Ret strømkabel"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Linie type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "linie"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Antal kabler"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "enkelt"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "dobbelt"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "tredobbelt"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "firdobbelt"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Faciliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toiletter"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -26512,5 +26448,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Ret telefon"
@@ -26518,5 +26454,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mønter"
@@ -26524,5 +26460,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Sedler"
@@ -26530,5 +26466,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Elektroniske punge og betalingskort"
@@ -26536,5 +26472,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Kreditkort"
@@ -26542,15 +26478,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Genbrug"
@@ -26559,5 +26495,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Ret genbrugsplads"
@@ -26565,35 +26501,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Dåser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Tøj"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Skrotjern"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26601,5 +26537,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26608,31 +26544,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "sten"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastik"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Farve"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "sort"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "brun"
@@ -26711,5 +26647,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26719,31 +26655,31 @@
 msgstr "grøn"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "rød"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "blå"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "grå"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "hvid"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Antal sæder"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Skydetelt"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Ret skydetelt"
@@ -26752,30 +26688,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Højde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "fuld"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Springvand"
@@ -26784,10 +26720,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Ret springvand"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Vandpost"
@@ -26796,10 +26732,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Ret vandpost"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26808,5 +26744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26814,5 +26750,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Babyluge"
@@ -26820,15 +26756,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Ret babyluge"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Bilforhandler"
@@ -26836,10 +26772,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Ret bilforhandler"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Cykelhandler"
@@ -26848,28 +26784,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Ret cykelhandler"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Ret supermarked"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Købmand"
@@ -26877,9 +26813,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Ret købmand"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26887,27 +26823,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Ret kiosk"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Boghandler"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Ret boghandler"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Rejsebureau"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Ret rejsebureau"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Slagter"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Ret slagter"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Bager"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Ret bager"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Blomsterhandler"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Ret blomsterhandler"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Økologisk"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Ret økologisk forretning"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Sprit"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Ret spritbutik"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Drikkevarer"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Ret drikkevarebutik"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Ret computerforretning"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronik"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Ret elektronikforretning"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hi-fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Ret hi-fi-forhandler"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Møbelforretning"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Ret møbelforretning"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Havecenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Ret havecenter"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Isenkræmmer"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Ret isenkræmmer"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Gør-det-selv-butik"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Ret gør-det-selv-butik"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Frisør"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Ret frisør"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Sko"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Ret skobutik"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Legetøjsbutik"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Ret legetøjsbutik"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Ret videobutik"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Kemisk renseri"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Ret kemisk renseri"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Vaskeri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Ret vaskeri"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Ret sportsbutik"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Ret optiker"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Automat"
@@ -26915,5 +27065,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Ret automat"
@@ -26921,306 +27071,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Varer i automat"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "P-automat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "mad"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "slik"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "billeder"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "dyremad"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "legetøj"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "frimærker"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "cykel"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tamponer"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "høm-høm-pose"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Slagter"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Ret slagter"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Bager"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Ret bager"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Blomsterhandler"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Ret blomsterhandler"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Økologisk"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Ret økologisk forretning"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Sprit"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Ret spritbutik"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Drikkevarer"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Ret drikkevarebutik"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Ret computerforretning"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronik"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Ret elektronikforretning"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hi-fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Ret hi-fi-forhandler"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Møbelforretning"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Ret møbelforretning"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Havecenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Ret havecenter"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Isenkræmmer"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Ret isenkræmmer"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Gør-det-selv-butik"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Ret gør-det-selv-butik"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Frisør"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Ret frisør"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Sko"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Ret skobutik"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Legetøjsbutik"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Ret legetøjsbutik"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Ret videobutik"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Kemisk renseri"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Ret kemisk renseri"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Vaskeri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Ret vaskeri"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Ret sportsbutik"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Ret optiker"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Penge"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -27228,14 +27170,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Ret bank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Pengeautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Vekselkontor"
@@ -27243,5 +27185,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Ret vekselkontor"
@@ -27249,15 +27191,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Ret pengeautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Sundhed"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Lægehus"
@@ -27265,18 +27207,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Ret lægehus"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Tandlæge"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Ret tandlæge"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -27284,5 +27226,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Ret apotek"
@@ -27290,9 +27232,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Håndkøb"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hospital"
@@ -27300,10 +27242,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Ret Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -27312,5 +27254,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -27319,20 +27261,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(brug forvalgskode, fx +12-345-67890)"
@@ -27340,5 +27282,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Dyrlæge"
@@ -27347,64 +27289,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Ret dyrlæge"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Ret et kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Ret land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Stat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Ret stat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Ret region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Amt"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Ret amt"
@@ -27412,15 +27354,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Ret storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "By"
@@ -27428,10 +27370,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Ret By"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Forstad"
@@ -27439,25 +27381,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Ret forstad"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Mindre by"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Ret mindre by"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Landsby"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Ret landsby"
@@ -27465,5 +27407,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Egn"
@@ -27471,10 +27413,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Ret lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ø"
@@ -27482,10 +27424,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Ret ø"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -27493,5 +27435,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -27499,5 +27441,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Huleindgang"
@@ -27505,10 +27447,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Ret huleindgang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Tinde"
@@ -27516,10 +27458,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Ret tinde"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -27527,10 +27469,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Ret gletsjer"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkan"
@@ -27538,70 +27480,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Ret vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Grænser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Ret landegrænser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrativt"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Ret administrativ grænse"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Ret civil-grænse"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Ret politisk grænse"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Ret grænser for nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Brug af land"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Træ"
@@ -27610,15 +27552,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Ret et træ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Naturskov"
@@ -27627,5 +27569,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Ret naturskov"
@@ -27633,17 +27575,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Nåleskov"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "Løvskov"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "blandet"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Skov"
@@ -27652,14 +27594,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Ret skovområde"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Ret naturreservat"
@@ -27667,25 +27609,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Ur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Ret ur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Krat"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Ret krat"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Fjeldområde"
@@ -27693,10 +27635,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Ret fjeldområde"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Hede"
@@ -27704,5 +27646,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Ret hede"
@@ -27710,5 +27652,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Gårdsplads"
@@ -27717,45 +27659,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Ret gårdsplads"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Jordbrugsland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Ret landbrugsland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Ret vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Kolonihaver"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Ret kolonihave-område"
@@ -27763,25 +27705,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Have"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Ret have"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Græs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27789,10 +27731,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27800,20 +27742,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Ret park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Rekreativt område"
@@ -27821,5 +27763,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Ret rekreativt område"
@@ -27827,15 +27769,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Beboelseområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Gravplads"
@@ -27843,9 +27785,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Ret gravplads"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -27853,39 +27795,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Ret kirkegård"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Detailhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Ret område for detailhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr ""
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industri"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Ret industri-område"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27893,15 +27835,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militært område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Ret militært område"
@@ -27909,50 +27851,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Byggeplads"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Ret område for byggeplads"
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Losseplads"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Ret losseplads"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Stenbrud"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Ret stenbrudsområde"
@@ -27962,5 +27904,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Ret multipolygon"
@@ -27969,10 +27911,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "ydre segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "indre segment"
@@ -27980,5 +27922,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27987,5 +27929,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27993,34 +27935,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "ingen_venstre_sving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "ingen_højre_sving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "ingen_lige_ud"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "ingen_u_vendinger"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "kun_højre_sving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "kun_venstre_sving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "kun_lige_ud"
@@ -28029,15 +27971,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "fra vej"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "til vej"
@@ -28045,5 +27987,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Rute"
@@ -28052,5 +27994,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Ret rute"
@@ -28058,5 +28000,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Rutetype"
@@ -28147,5 +28089,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28155,17 +28097,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "vej"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "færge"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -28225,5 +28167,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28232,9 +28174,9 @@
 msgstr "fod"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "sporvogn"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "omvej"
@@ -28248,10 +28190,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "undergrundsbane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbol beskrivelse"
@@ -28259,31 +28201,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Netværk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "foreslået"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "skiftende"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Farve (hex)"
@@ -28292,32 +28234,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "rute-segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -32340,4 +32357,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicilen - Italien"
+
+#~ msgid "Bikes"
+#~ msgstr "Cykler"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/de.po
===================================================================
--- /applications/editors/josm/i18n/po/de.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/de.po	(revision 20945)
@@ -9,7 +9,7 @@
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-09 11:09+0000\n"
-"Last-Translator: Ingolf Knopf <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-16 06:26+0000\n"
+"Last-Translator: cmdrhenner <cmdrhenner@gmail.com>\n"
 "Language-Team: German <kde-i18n-de@kde.org>\n"
 "MIME-Version: 1.0\n"
@@ -17,5 +17,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1208,5 +1208,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Kann Objekte nicht nach außerhalb der Welt verschieben."
@@ -1540,5 +1540,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2325,9 +2325,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2410,18 +2410,18 @@
 msgstr "Zeichnen beenden."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Ausziehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Gebiete erstellen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Weg ausziehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
@@ -2429,10 +2429,10 @@
 "Mausknopf loslassen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Ein Rechteck der gewünschten Größe zeichnen und dann den Mausknopf loslassen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2454,6 +2454,6 @@
 "Zusätzliches Drücken der Umschalttaste synchronisiert Audio an diesem Punkt."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2465,9 +2465,9 @@
 msgstr "Auswahl"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Objekte auswählen, verschieben, und drehen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2476,17 +2476,17 @@
 msgstr[1] "Virtuellen Knoten zu {0} Wegen hinzufügen und bewegen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Elemente verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Verschieben"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Verschieben rückgängig machen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2499,9 +2499,9 @@
 "Wollen Sie sie wirklich verschieben?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Maustaste loslassen, um Objekte im Rechteck auszuwählen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2510,9 +2510,9 @@
 "Knoten vereinigen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Maustaste loslassen, um das Drehen zu stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3291,5 +3291,5 @@
 msgstr "Anwenden?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3712,5 +3712,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:265
 msgid "<h2>Filter active</h2>"
-msgstr ""
+msgstr "<h2>Filter aktiv</h2>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:271
@@ -3726,5 +3726,5 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:282
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr ""
+msgstr "</p><p>Den Filterdialog schließen, um alle Objekte zu sehen<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:463
@@ -3918,17 +3918,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "Standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Verbindung"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "markiert"
+msgstr ""
 
 #. teal
@@ -4113,5 +4110,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "Eisenbahn"
@@ -5472,5 +5469,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -5924,4 +5921,9 @@
 msgstr "Filtermodus"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -6012,5 +6014,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relationen"
@@ -6114,9 +6116,9 @@
 msgstr "Auswahl: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Ansicht separat darstellen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6125,5 +6127,5 @@
 "Werkzeugleiste."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicken Sie zum Minimieren oder Maximieren der Ansicht"
@@ -6469,4 +6471,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6479,10 +6487,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7152,145 +7154,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Name"
@@ -8603,10 +8605,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Typ"
@@ -8614,5 +8616,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8626,17 +8627,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "unbekannt"
@@ -9510,11 +9510,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9531,14 +9533,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Ebene"
@@ -10130,5 +10132,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Beschreibung"
@@ -11290,26 +11292,26 @@
 msgstr "Dialog schließen und Zugriffskennung annehmen"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Warnung: Abbruch der laufenden OAuth-Anfrage fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "OAuth-Anfragekennung von ''{0}'' abrufen"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "OAuth-Zugriffskennung von ''{0}'' abrufen"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "OSM-Webseite lieferte keinen Sitzungs-Cookie als Antwort auf ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11318,29 +11320,29 @@
 "Benutzer fehlgeschlagen"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "OAuth-Autorisierungsanfrage ''{0}'' fehlgeschlagen."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Autorisiere OAuth-Anfragekennung ''{0}'' bei der OSM-Webseite ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Initialisiere eine Sitzung auf der OSM-Webseite..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Authentifiziere die Sitzung für ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Autorisiere Anfragekennung ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11880,5 +11882,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Auto"
@@ -11900,16 +11902,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Fahrrad"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11939,12 +11942,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Zu Fuß"
@@ -12695,17 +12698,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Erweiterte OAuth-Parameter"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Straßenname"
+msgstr "Parameter Name"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Gemessene Werte"
+msgstr "Parameter Wert"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -15273,6 +15273,7 @@
 msgstr "GPS-Spuren hochladen"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Sichtbarkeit"
@@ -15364,5 +15365,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -15554,5 +15555,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Erstelle ein Gebäude"
@@ -15593,19 +15594,19 @@
 msgstr "Breite des Gebäudes festlegen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr "Gebäude aufnehmen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Gebäude durch Klicken extrahieren (nur Vektorbilder)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Gebäude"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15615,5 +15616,5 @@
 "Gebäude-Ebene und eine OSM-Datenebene."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15629,10 +15630,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Feuille auswählen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15676,7 +15677,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Guadeloupe Ste-Anne Zwischenspeicherdatei (.UTM2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15829,5 +15829,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17739,5 +17739,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Öffentliche Verkehrsmittel"
@@ -17789,5 +17789,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Wegpunkte"
@@ -18374,4 +18374,23 @@
 "Die folgende Tabelle erlaubt das Bearbeiten der <strong>Element</strong> der "
 "Relation, die diese Abbiegebeschränkung repräsentiert."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Typ"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Von:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+#, fuzzy
+msgid "To:"
+msgstr "Nach:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
@@ -18549,4 +18568,18 @@
 msgstr "Bereits an einem Konflikt beteiligt"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Aus Abbiegeeinschränkung entfernen"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Aus Abbiegeeinschränkung entfernen"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -19370,5 +19403,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20763,7 +20796,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referenz"
@@ -20780,5 +20813,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Spuren"
@@ -20796,4 +20829,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20801,9 +20835,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Höchstgeschwindigkeit (km/h)"
@@ -20831,15 +20864,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20850,11 +20877,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Einbahnstraße"
@@ -20874,15 +20900,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20899,11 +20923,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20924,8 +20948,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20943,11 +20967,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -20967,6 +20991,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20984,11 +21008,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Senke"
@@ -21008,6 +21032,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -21025,11 +21049,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Straßendamm"
@@ -21167,5 +21191,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Ausweichstellen"
@@ -21174,12 +21198,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -21187,13 +21214,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Breite (Meter)"
@@ -21222,24 +21249,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Oberfläche"
@@ -21251,5 +21274,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -21263,11 +21286,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "befestigt"
@@ -21275,10 +21297,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "unbefestigt"
@@ -21286,10 +21308,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asphaltiert"
@@ -21297,11 +21319,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "Beton"
@@ -21309,10 +21330,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "Metall"
@@ -21320,10 +21341,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "Holz"
@@ -21331,10 +21352,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "Gehwegplatte/Pflaster"
@@ -21342,11 +21363,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "Kopfsteinpflaster"
@@ -21354,10 +21374,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "Schotter"
@@ -21365,10 +21385,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "Kies"
@@ -21376,10 +21396,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "verdichtet"
@@ -21387,10 +21407,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "Rasengitterstein"
@@ -21398,10 +21418,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "Gras"
@@ -21409,10 +21429,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "Sand"
@@ -21420,10 +21440,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "Erde"
@@ -21504,6 +21524,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Unbekannter Straßentyp"
@@ -21512,5 +21531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Straße mit unbekanntem Typ bearbeiten"
@@ -21518,6 +21537,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Baustelle"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Eine im Bau befindliche Straße bearbeiten"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Kreuzung"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "Kreisverkehr"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Straßenbeschränkungen"
@@ -21526,15 +21574,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Straßenbeschränkungen bearbeiten"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Maut"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Kein Ausgang (Sackgasse)"
@@ -21542,5 +21590,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Genereller Zugang"
@@ -21582,28 +21630,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ja"
@@ -21616,10 +21663,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21633,10 +21680,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21660,97 +21707,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "Privat; Zugang gestattet"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "Landwirtschaftlicher Verkehr gestattet"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "Forstwirtschaftlicher Verkehr gestattet"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "Lieferverkehr frei"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nein"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Landwirtschaft"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "Bezeichnete/vorgesehene Nutzungsart"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "Offizielle Nutzungsart"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Kleinlaster"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "LKW"
@@ -21765,10 +21812,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Pferd"
@@ -21784,10 +21831,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorrad"
@@ -21802,19 +21849,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Automobil"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Öffentlicher Verkehr & Taxi"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. Geschwindigkeit (km/h)"
@@ -21822,20 +21869,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. Gewicht (Tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. Höhe (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. Breite (Meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. Länge (Meter)"
@@ -21843,5 +21890,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Kreisverkehr"
@@ -21852,5 +21899,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Kreuzung bearbeiten"
@@ -21870,10 +21917,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autobahn"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "Autobahnanschluß"
@@ -21895,10 +21942,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Schnellstraße"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "Schnellstraßenanschluß"
@@ -21920,10 +21967,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "Bundesstraße"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "Bundesstraßenanschluß"
@@ -21945,5 +21992,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21958,9 +22005,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "Kreisstraße"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "Verbindungsstraße"
@@ -21974,9 +22021,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "Ortsstraße"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "Spielstraße"
@@ -22006,10 +22053,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "Service"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "Spurbus"
@@ -22039,5 +22086,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -22049,10 +22096,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Brücke bearbeiten"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Tunnel bearbeiten"
@@ -22060,39 +22107,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Wege"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Baustelle"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Eine im Bau befindliche Straße bearbeiten"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Kreuzung"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "Kreisverkehr"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Feld- oder Waldweg"
@@ -22101,73 +22119,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Feld- oder Waldweg bearbeiten"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Typ des Weges"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "Grad 1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "Grad 2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "Grad 3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "Grad 4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "Grad 5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "MTB-Skala"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "SAC-Skala"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "Wandern"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "Bergwanderweg"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "Anspruchsvoller Bergwanderweg"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "Alpiner Wanderweg"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "Anspruchsvoller alpiner Wanderweg"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "Schwerer alpiner Wanderweg"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Pfad"
@@ -22176,38 +22162,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Pfad bearbeiten"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "SAC-Skala"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "Wandern"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "Bergwanderweg"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "Anspruchsvoller Bergwanderweg"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "Alpiner Wanderweg"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "Anspruchsvoller alpiner Wanderweg"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "Schwerer alpiner Wanderweg"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "exzellent"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "gut"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "mittelschwer"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "schlecht"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "sehr schlecht"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Rollstuhl"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Schneemobil"
@@ -22216,5 +22232,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Ausgewiesener Reitweg"
@@ -22222,5 +22238,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Reitweg bearbeiten"
@@ -22228,5 +22244,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Ausgewiesener Fahrradweg"
@@ -22244,11 +22260,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Fahrradweg bearbeiten"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Fußgänger"
@@ -22256,5 +22272,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Geteilter Fuß- und Fahradweg"
@@ -22262,5 +22278,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Kombinierter Fuß- und Fahrradweg"
@@ -22268,5 +22284,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Ausgewiesener Fußweg"
@@ -22275,15 +22291,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Fußweg bearbeiten"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Fahrräder"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Treppe"
@@ -22293,10 +22305,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Treppe bearbeiten"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Anschlussstelle"
@@ -22304,15 +22316,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Anschlussstelle bearbeiten"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Rastplatz / Autohof"
@@ -22320,5 +22332,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Rastplatz / Autohof bearbeiten"
@@ -22358,17 +22370,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Betreiber"
@@ -22377,5 +22389,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Ampel"
@@ -22385,5 +22397,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Typ des Fußgängerüberwegs"
@@ -22392,27 +22404,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "unkontrolliert"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "Ampel"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "Insel"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "unmarkiert"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Zu Pferd"
@@ -22420,6 +22432,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Mit Fahrrad"
@@ -22428,11 +22440,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Schülerlotse"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Übergangstyp (UK)"
@@ -22440,30 +22452,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "Zebrastreifen"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "Ampel (Pelikan)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "Fußgängerampel (Toukan)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "Fußgängerampel (Puffin)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "Ampel für Füßgänger, Fahrrad, Pferd (Pegasus)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "Zebrastreifen (Tiger)"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stopp-Schild"
@@ -22471,5 +22483,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Fußgängerüberweg"
@@ -22478,14 +22490,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Fußgängerüberweg bearbeiten"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Typname (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Verkehrsberuhigung"
@@ -22493,33 +22505,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Verkehrsberuhigung bearbeiten"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "Bodenschwelle"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "Schikane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "Fahrbahnverengung"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "Bodenwelle (mit Lücken)"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "Bodenwelle (lang)"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "Bodenwelle (sehr lang und flach)"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Ausweichstelle"
@@ -22527,5 +22539,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Ausweichstelle bearbeiten"
@@ -22533,5 +22545,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Kleiner Kreisverkehr"
@@ -22542,14 +22554,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Richtung"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "Im Uhrzeigersinn"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Wendestelle"
@@ -22559,5 +22571,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Ortseingangsschild"
@@ -22565,15 +22577,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Ortseingangsschild bearbeiten"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Zweiter Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Geschwindigkeitsüberwachung"
@@ -22582,5 +22594,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Notfalltelefon"
@@ -22588,5 +22600,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Steigung"
@@ -22594,5 +22606,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Starke Steigung"
@@ -22600,5 +22612,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Splittbehälter"
@@ -22608,10 +22620,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Furt"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Furt bearbeiten"
@@ -22619,5 +22631,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Gebirgspass"
@@ -22625,5 +22637,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Gebirgspass bearbeiten"
@@ -22635,7 +22647,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Höhe"
@@ -22643,5 +22655,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barrieren"
@@ -22649,5 +22661,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Poller"
@@ -22655,5 +22667,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Poller bearbeiten"
@@ -22698,16 +22710,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Erlaubter Verkehr:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Umlaufgitter"
@@ -22716,5 +22728,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Steinblock"
@@ -22722,5 +22734,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Viehgitter"
@@ -22728,10 +22740,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Viehgitter bearbeiten"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Busschleuse"
@@ -22739,15 +22751,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spikes / Dornen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Spikes / Dornen bearbeiten"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Mautstation"
@@ -22755,5 +22767,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Mautstation bearbeiten"
@@ -22761,10 +22773,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Grenzkontolle"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Grenzkontrolle bearbeiten"
@@ -22774,5 +22786,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Hecke"
@@ -22783,22 +22795,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Zaun"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "Zaun"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "Holzzaun"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "Holzzaun"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Mauer"
@@ -22806,5 +22818,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Stadtmauer"
@@ -22813,5 +22825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Stützmauer"
@@ -22823,10 +22835,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Eingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Eingang bearbeiten"
@@ -22834,5 +22846,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Gatter / Tor"
@@ -22840,50 +22852,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Gatter / Tor bearbeiten"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Schlagbaum"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Schlagbaum bearbeiten"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Drahtgatter"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Drahtgatter bearbeiten"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Fahrzeuggatter"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Fahrzeuggatter bearbeiten"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Personengatter"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Personengatter bearbeiten"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Zauntreppe"
@@ -22891,25 +22903,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Zauntreppe bearbeiten"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Drehsperre"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Drehsperre bearbeiten"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Durchgangsschleuse"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Durchgangsschleuse bearbeiten"
@@ -22920,11 +22932,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Wasser"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Quelle"
@@ -22932,5 +22944,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Quelle bearbeiten"
@@ -22938,5 +22950,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Abwassergraben"
@@ -22944,10 +22956,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Abwassergraben bearbeiten"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Wassergraben"
@@ -22955,10 +22967,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Wassergraben bearbeiten"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Bach"
@@ -22966,10 +22978,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Bach bearbeiten"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -22977,10 +22989,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Kanal bearbeiten"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Fluss"
@@ -22990,5 +23002,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Fluss bearbeiten"
@@ -22996,15 +23008,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Wasserfläche bearbeiten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Landfläche bearbeiten"
@@ -23012,15 +23024,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Wasserbecken"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Wasserbecken bearbeiten"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Speicherbecken"
@@ -23028,15 +23040,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Speicherbecken bearbeiten"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Überdecktes Speicherbassin"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Überdecktes Speicherbassin bearbeiten"
@@ -23044,5 +23056,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Flussbett"
@@ -23051,10 +23063,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Flussbett bearbeiten"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Feuchtgebiet"
@@ -23065,14 +23077,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Feuchtgebiet bearbeiten"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Sumpf"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "Moor"
@@ -23086,35 +23098,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "Marsch"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "Röhricht"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "Salzwiese"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "Watt"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "Mangroven"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Schlick & Moor"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Schlickiges Gebiet bearbeiten"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strand"
@@ -23122,20 +23134,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Strand bearbeiten"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Meeresbucht"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Meeresbucht bearbeiten"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Klippe"
@@ -23143,10 +23155,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Klippe bearbeiten"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Küstenlinie"
@@ -23154,5 +23166,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Küstenlinie bearbeiten"
@@ -23160,5 +23172,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Fährroute"
@@ -23166,5 +23178,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Fährroute bearbeiten"
@@ -23173,5 +23185,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Bootswerft"
@@ -23179,10 +23191,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Bootswerft bearbeiten"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dock"
@@ -23190,5 +23202,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Dock bearbeiten"
@@ -23196,5 +23208,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Damm"
@@ -23202,15 +23214,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Damm bearbeiten"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Gewässerpunkte"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Schleusentor"
@@ -23219,5 +23231,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Wehr"
@@ -23225,20 +23237,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Wehr bearbeiten"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Wasserfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Wasserfall bearbeiten"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Wendepunkt"
@@ -23247,15 +23259,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Jachthafen"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Jachthafen bearbeiten"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Anlegestelle (Pier)"
@@ -23263,10 +23275,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Anlegestelle (Pier) bearbeiten"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Fährstelle"
@@ -23274,10 +23286,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Fährstelle bearbeiten"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Bootshebeanlage"
@@ -23287,20 +23299,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Bootshebeanlage bearbeiten"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Eisenbahn"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Eisenbahn"
@@ -23308,5 +23320,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Eisenbahn bearbeiten"
@@ -23336,86 +23348,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Spurweite (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "Standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -23427,8 +23364,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Arten"
@@ -23442,29 +23379,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "Rangiergleis"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "Abstellgleis"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "Firmenanschlußgleis"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Elektrifiziert"
@@ -23477,8 +23414,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "Oberleitung"
@@ -23549,8 +23486,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23562,8 +23499,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Spannung"
@@ -23576,8 +23513,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Frequenz (Hz)"
@@ -23590,23 +23527,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16,7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Schmalspurbahn"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Schmalspurbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Einschienenbahn"
@@ -23614,50 +23551,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Einschienenbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Museumsbahn"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Museumsbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Stadtbahn"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Stadtbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "U-Bahn"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "U-Bahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Straßenbahn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Straßenbahn bearbeiten"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Spurbus"
@@ -23665,5 +23602,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Spurbusstrecke bearbeiten"
@@ -23672,10 +23609,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Stillgelegte Strecke"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Stillgelegte Strecke bearbeiten"
@@ -23684,9 +23621,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Optionale Typen"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Strecke abgebaut"
@@ -23695,5 +23632,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Bahnübergang"
@@ -23702,5 +23639,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "(Fuß-)Übergang"
@@ -23710,5 +23647,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Art des Übergangs"
@@ -23716,5 +23653,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Drehscheibe"
@@ -23723,5 +23660,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Prellbock"
@@ -23730,10 +23667,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Seilbahnen"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Sessellift"
@@ -23741,10 +23678,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Sessellift bearbeiten"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Schlepplift"
@@ -23752,10 +23689,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Schlepplift bearbeiten"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Seilbahn"
@@ -23763,10 +23700,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Seilbahn bearbeiten"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondelbahn"
@@ -23774,10 +23711,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Gondelbahn bearbeiten"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23786,5 +23723,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23792,5 +23729,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23799,5 +23736,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23805,5 +23742,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Tankstelle"
@@ -23813,62 +23750,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Tankstelle bearbeiten"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Freie Tankstelle"
@@ -23926,32 +23863,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Öffnungszeiten"
@@ -24010,165 +23947,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Kraftstoffsorten:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (teilweise synthetisch, V-Power etc.)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel für LKW"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "Normalbenzin"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "Super"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "Super plus"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "100 Oktan"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol Gemisch)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Flüssiggas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (komprimiertes Erdgas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "1:25 Gemisch (Mofa/Moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "1:50 Gemisch (Mofa/Moped)"
@@ -24185,5 +24122,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -24193,5 +24130,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Parken bearbeiten"
@@ -24202,25 +24139,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referenznummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "Parkhaus"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "ebenerdig"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "Tiefgarage"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -24229,48 +24166,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Gebühr"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Gesamtkapazität"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Behindertenparkplätze"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Stellplätze für Frauen"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Stellplätze für Eltern"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Siehe Wiki für weitere Werte capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Autowäsche"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Autowäsche bearbeiten"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Werkstatt"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Autowerkstatt bearbeiten"
@@ -24278,5 +24215,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Vermietung"
@@ -24285,10 +24222,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Autovermietung bearbeiten"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Autotausch / Car Sharing"
@@ -24296,5 +24233,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Autotausch (Car Sharing) bearbeiten"
@@ -24302,10 +24239,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Fahrradparkplatz bearbeiten"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapazität"
@@ -24314,10 +24251,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Fahrradleihstelle bearbeiten"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -24327,5 +24264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -24333,5 +24270,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Referenz"
@@ -24339,5 +24276,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Eisenbahnhaltepunkt"
@@ -24345,5 +24282,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Haltepunkt bearbeiten"
@@ -24351,5 +24288,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Straßenbahnhaltestelle"
@@ -24358,5 +24295,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Straßenbahnhaltestelle bearbeiten"
@@ -24364,5 +24301,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Bahnsteig"
@@ -24371,5 +24308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Bahnsteig bearbeiten"
@@ -24381,5 +24318,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Referenznummer (Steig)"
@@ -24387,10 +24324,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Fläche"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "U-Bahn-Eingang"
@@ -24399,10 +24336,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "U-Bahn-Eingang bearbeiten"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Rollstuhl"
@@ -24411,5 +24348,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Busbahnhof"
@@ -24418,5 +24355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Busbahnhof bearbeiten"
@@ -24424,5 +24361,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Bushaltestelle"
@@ -24432,5 +24369,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Bushaltestelle bearbeiten"
@@ -24439,6 +24376,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Schutzraum"
@@ -24446,19 +24383,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Sitzbank"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Blindenleitbelag"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Bussteig"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Bussteig bearbeiten"
@@ -24466,5 +24403,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -24472,5 +24409,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Taxihaltepunkt bearbeiten"
@@ -24478,10 +24415,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Flughafen"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Flugplatz"
@@ -24489,5 +24426,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Flugplatz bearbeiten"
@@ -24495,10 +24432,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -24507,5 +24444,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Start-/Landebahn"
@@ -24513,5 +24450,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Start-/Landebahn bearbeiten"
@@ -24519,5 +24456,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Rollbahn"
@@ -24525,5 +24462,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Rollbahn bearbeiten"
@@ -24531,5 +24468,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Hubschrauberlandeplatz"
@@ -24537,5 +24474,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Hubschrauberlandeplatz bearbeiten"
@@ -24545,5 +24482,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Vorfeld"
@@ -24553,5 +24490,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -24562,6 +24499,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Bake"
@@ -24571,5 +24508,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Windsack"
@@ -24578,5 +24515,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Terminal"
@@ -24584,5 +24521,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Terminal bearbeiten"
@@ -24590,15 +24527,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Terminal-Gate bearbeiten"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Reisen"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Unterkunft"
@@ -24610,5 +24547,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24617,15 +24554,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Hotel bearbeiten"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Sterne"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24633,20 +24570,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Motel bearbeiten"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Gästehaus (Bed & Breakfast)"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Gästehaus bearbeiten"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Ferienhaus"
@@ -24654,10 +24591,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Ferienhaus bearbeiten"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Jugendherberge"
@@ -24665,30 +24602,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Jugendherberge bearbeiten"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Alpenhütte"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Alpenhütte bearbeiten"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Wohnwagenstellplätze"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Wohnwagenstellplätze bearbeiten"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Campingplatz"
@@ -24696,10 +24633,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Campingplatz bearbeiten"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Essen & Trinken"
@@ -24710,5 +24647,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24716,5 +24653,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Restaurant bearbeiten"
@@ -24722,5 +24659,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Küche"
@@ -24728,73 +24665,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italienisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chinesisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "Pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "Hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "griechisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "deutsch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "Döner"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "türkisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thailändisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexikanisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "französisch"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "Sandwich"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "Sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Imbiss (Fast Food)"
@@ -24802,17 +24739,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Imbiss (Fast Food-Restaurant) bearbeiten"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "Fish and Chips"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "Hähnchen"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Café"
@@ -24820,9 +24757,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Café bearbeiten"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Kneipe"
@@ -24830,18 +24767,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Kneipe bearbeiten"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Biergarten bearbeiten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24849,9 +24786,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Bar bearbeiten"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -24859,24 +24796,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Nachtclub bearbeiten"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Tourismus"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attraktion"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Attraktion bearbeiten"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -24884,9 +24821,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Museum bearbeiten"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24895,9 +24832,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Zoo bearbeiten"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Aussichtspunkt"
@@ -24905,24 +24842,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Aussichtspunkt bearbeiten"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Aussichtsturm"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Themenpark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Themenpark bearbeiten"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Kunstausstellung"
@@ -24930,5 +24867,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Kunstausstellung bearbeiten"
@@ -24936,19 +24873,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Informationsbüro"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Karte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Detailgrad"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topographisch"
@@ -24986,5 +24923,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24992,28 +24929,28 @@
 msgstr "Straße"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "schematisch"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Kartenausschnitt"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "Örtlichkeit"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "Stadt"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "Region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Nähere Beschreibung"
@@ -25023,5 +24960,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Dargestellte Routen für:"
@@ -25029,5 +24966,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Wanderweg"
@@ -25035,6 +24972,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Radfahren"
@@ -25042,5 +24979,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountainbike fahren"
@@ -25048,6 +24985,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skifahren"
@@ -25055,5 +24992,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Reiten"
@@ -25061,46 +24998,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "...andere mögliche Transportarten"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Informationstafel"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Inhalt"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "Notiz"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "Geschichte"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "Natur"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "Wildtiere"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "Pflanzen"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Wegweiser"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Informationsterminal"
@@ -25108,29 +25045,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Nähere Beschreibung"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide per Handy?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Telefonnummer"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Andere Informationspunkte"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Schutzraum bearbeiten"
@@ -25138,25 +25075,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Feuerstelle"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picknickplatz"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Picknickplatz bearbeiten"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historische Stätten"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Burg / Schloß"
@@ -25165,19 +25102,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Burg / Schloß bearbeiten"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruinen"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Ruinen bearbeiten"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Ausgrabungsstelle"
@@ -25186,9 +25123,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Ausgrabungsstelle bearbeiten"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Schlachtfeld"
@@ -25196,10 +25133,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Schlachtfeld bearbeiten"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Paläontologische Stätte"
@@ -25207,5 +25144,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Paläontologische Stätte bearbeiten"
@@ -25213,15 +25150,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Baudenkmal"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Baudenkmal bearbeiten"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Gedenkstätte"
@@ -25229,55 +25166,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Gedenkstätte bearbeiten"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Wegkreuz"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Wegkreuz bearbeiten"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Bildstock"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Bildstock bearbeiten"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Grenzstein"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Grenzstein bearbeiten"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Freizeit"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Schwimmbad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Schwimmbad bearbeiten"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Spielplatz"
@@ -25285,35 +25222,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Spielplatz bearbeiten"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Angeln"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Angelplatz bearbeiten"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sporteinrichtungen"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadion bearbeiten"
@@ -25327,6 +25264,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Sportart wählen:"
@@ -25718,6 +25655,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25751,225 +25688,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "Mehrfachnutzung"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "Bogenschießen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "Leichtathletik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "Australian Football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "Baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Boule"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "Bowls"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "Kanu"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Klettern"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "Kricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Kricketnetze"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "Krocket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "Fahrradfahren"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "Hunderennen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "Reiten"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "American Football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "Gymnastik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "Pferderennen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "Schlagball (Racquet)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "Schießen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "Skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "Eislaufen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "Skifahren"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Fußball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "Schwimmen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "Tischtennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sporthalle / Fitnesscenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Sporthalle / Fitnesscenter bearbeiten"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Spielfeld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Spielfeld bearbeiten"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Rennbahn"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Rennbahn bearbeiten"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfanlage"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golfanlage bearbeiten"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minigolfplatz bearbeiten"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Mehrfachnutzung"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Mehrfach genutzten Sportplatz bearbeiten"
@@ -26008,21 +25945,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "Typ"
@@ -26061,203 +25998,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "Spielfeld"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "Sporthalle / Fitnesscenter"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "Weg"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Bowlinghalle bearbeiten"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Leichtathletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Leichtathletikfeld bearbeiten"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bogenschießen"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Bogenschießplatz bearbeiten"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klettern"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Kletterbereich bearbeiten"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanufahren"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kanufahrtstrecke bearbeiten"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Radsporthalle oder -kurs bearbeiten"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hunderennen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Trainingsplatz für Hunde bearbeiten"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Reitplatz"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Reitplatz bearbeiten"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Pferderennen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Pferderennplatz bearbeiten"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Gymnastikbereich bearbeiten"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motorsportplatz bearbeiten"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Eislaufen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Eislaufbahn bearbeiten"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Skateboardplatz bearbeiten"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Schwimmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Schwimmbad bearbeiten"
@@ -26265,52 +26202,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Skipiste bearbeiten"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Pistentyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Abfahrt"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Langlauf"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "Schneepark"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Schwierigkeit"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "Anfänger"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "einfach"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "fortgeschritten"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "Experte"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "Freistil"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Schießen"
@@ -26318,177 +26255,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Schießbahn bearbeiten"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fußball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Fußballplatz bearbeiten"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "American Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Australian Football-Platz bearbeiten"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Baseballplatz bearbeiten"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketballplatz bearbeiten"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golfplatz"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golfplatz bearbeiten"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfanlage"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule-Spielbereich bearbeiten"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowls-Spielfeld bearbeiten"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Kricketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Kricketnetze"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Kricketnetze bearbeiten"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Krocketspielfeld bearbeiten"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockeyplatz bearbeiten"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelotaplatz bearbeiten"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Schlagball (Racquet)"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Schlagball (Racquet)-Platz bearbeiten"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugbyplatz bearbeiten"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tischtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Tischtennisplatz bearbeiten"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennisplatz bearbeiten"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Gebäude"
@@ -26496,5 +26433,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Öffentliches Gebäude"
@@ -26502,10 +26439,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Öffentliches Gebäude bearbeiten"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rathaus"
@@ -26513,10 +26450,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Rathaus bearbeiten"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Botschaft"
@@ -26524,10 +26461,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Botschaft bearbeiten"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Gericht"
@@ -26536,10 +26473,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Gericht bearbeiten"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Gefängnis"
@@ -26548,10 +26485,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Gefängnis bearbeiten"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polizei"
@@ -26561,10 +26498,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Polizei bearbeiten"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Feuerwache"
@@ -26573,10 +26510,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Feuerwache bearbeiten"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Post"
@@ -26584,5 +26521,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Post bearbeiten"
@@ -26590,15 +26527,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Kindergarten"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Kindergarten bearbeiten"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Schule"
@@ -26606,10 +26543,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Schule bearbeiten"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universität"
@@ -26617,10 +26554,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universität bearbeiten"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Hochschule"
@@ -26628,5 +26565,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "College bearbeiten"
@@ -26634,5 +26571,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -26641,10 +26578,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Kino bearbeiten"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliothek"
@@ -26653,9 +26590,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Bibliothek bearbeiten"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kulturzentrum"
@@ -26663,10 +26600,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Kulturzentrum bearbeiten"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theater"
@@ -26675,10 +26612,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Theater bearbeiten"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kirche"
@@ -26688,5 +26625,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Kirche bearbeiten"
@@ -26695,6 +26632,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -26703,66 +26640,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahaiistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddhistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "christlich"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jainistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "jüdisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "moslemisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikhistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoistisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarisch"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Konfession"
@@ -26771,81 +26708,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikanisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptistisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katholisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelikal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Zeugen Jehovas"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "lutherisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "methodistisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormonisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "Pfingstgemeinde"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyterianisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestantisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "Quäker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "schiitisch"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnitisch"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adressen"
@@ -26854,5 +26791,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adressinformationen bearbeiten"
@@ -26860,5 +26797,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Hausnummer"
@@ -26866,25 +26803,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Hausname"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Straßenname"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Ortsname"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postleitzahl"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Länderkennung"
@@ -26893,5 +26830,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adressinterpolation bearbeiten"
@@ -26899,61 +26836,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummernschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "ungerade"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "gerade"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabetisch"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Zivilisationsbauten"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Fabrik bearbeiten"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Turm"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Turm bearbeiten"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Art des Turms"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "Kommunikation"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "Beobachtung"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Höhe (in Meter)"
@@ -26961,25 +26898,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Wasserturm"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Wasserturm bearbeiten"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Gasometer bearbeiten"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Leuchtturm"
@@ -26987,10 +26924,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Leuchtturm bearbeiten"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmühle"
@@ -26998,10 +26935,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Windmühle bearbeiten"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -27010,41 +26947,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Pipeline bearbeiten"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "Gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "Wärme"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "Öl"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "Abwasser"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "Beliebige Substanz"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Ort"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "Unter Wasser"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "oberirdisch"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kläranlage"
@@ -27054,10 +26991,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Kläranlage bearbeiten"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Stationärer Kran"
@@ -27065,5 +27002,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Stationären Kran bearbeiten"
@@ -27071,10 +27008,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Bake bearbeiten"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vermessungspunkt"
@@ -27082,10 +27019,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Vermessungspunkt bearbeiten"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Überwachungskamera"
@@ -27093,23 +27030,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Überwachungskamera bearbeiten"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "im Gebäude"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "im Freien"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "öffentlich"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Stromgenerator"
@@ -27119,35 +27056,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Stromgenerator bearbeiten"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "Wind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "Wasser"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "Fossil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "Nuklear"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "Kohle"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "Photovoltaik"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Umspannwerk"
@@ -27156,10 +27093,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Umspannwerk bearbeiten"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Trafostation"
@@ -27168,5 +27105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Trafostation bearbeiten"
@@ -27174,10 +27111,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Liniennummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Strommast"
@@ -27188,23 +27125,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Strommast bearbeiten"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "Turm"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "Mast"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Identifikation des Turms"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Stromleitung"
@@ -27213,74 +27150,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Stromleitung bearbeiten"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Art der Stromleitung"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "Freileitung (Starkstrom)"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "Freileitung (Schwachstrom)"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Anzahl Leitungen"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Anzahl der Adern (besser: Leiter) je Stromkabel"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "einzeln"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "doppelt"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "dreifach"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "vierfach"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Einrichtungen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limitiert"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Briefkasten"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -27289,5 +27226,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Telefon bearbeiten"
@@ -27295,5 +27232,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Münzen"
@@ -27301,5 +27238,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Scheine"
@@ -27307,5 +27244,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Geld- oder Prepaidkarten"
@@ -27313,5 +27250,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Konto- oder EC-Karten"
@@ -27319,15 +27256,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditkarten"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonkarten"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recyclingstelle & -container"
@@ -27336,5 +27273,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Recyclingstelle oder -container bearbeiten"
@@ -27342,35 +27279,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterien"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Dosen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Kleidung"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Altmetall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Abfalleimer"
@@ -27378,5 +27315,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Abfalleimer bearbeiten"
@@ -27385,31 +27322,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Lehne"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "Stein"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "Kunststoff"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Farbe"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "schwarz"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "braun"
@@ -27488,5 +27425,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27496,31 +27433,31 @@
 msgstr "grün"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "rot"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "blau"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "grau"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "weiß"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Anzahl der Sitzplätze"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Jagdanstand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Jagdanstand bearbeiten"
@@ -27529,30 +27466,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Höhe"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "niedrig"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "halb"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "voll"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Versteck"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Schloß"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Springbrunnen"
@@ -27561,10 +27498,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Springbrunnen bearbeiten"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Trinkwasser"
@@ -27573,10 +27510,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Trinkwasserabgabe bearbeiten"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27585,5 +27522,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Hydrant bearbeiten"
@@ -27591,5 +27528,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Babyklappe"
@@ -27597,15 +27534,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Babyklappe bearbeiten"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Geschäfte"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Autohändler"
@@ -27613,10 +27550,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Autohaus bearbeiten"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Fahrradladen"
@@ -27625,28 +27562,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Fahrradladen bearbeiten"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Supermarkt bearbeiten"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Drogerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Drogerie bearbeiten"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Tante-Emma-Laden"
@@ -27654,9 +27591,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Tante-Emma-Laden bearbeiten"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27664,27 +27601,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Kiosk bearbeiten"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Buchhandlung"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Buchhandlung bearbeiten"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Reisebüro"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Reisebüro bearbeiten"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Fleischer"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Fleischer bearbeiten"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Bäcker"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Bäcker bearbeiten"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Blumenladen"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Blumenladen bearbeiten"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Bioladen"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Bioladen bearbeiten"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Spirituosen"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Spirituosengeschäft bearbeiten"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Getränke"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Getränkeladen bearbeiten"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Computergeschäft bearbeiten"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronikgeschäft"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Elektronikgeschäft bearbeiten"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Hifi-Geschäft bearbeiten"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Mobiliar"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Möbelgeschäft bearbeiten"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Gartenzentrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Gartenzentrum bearbeiten"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Haushaltswaren"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Haushaltswaren bearbeiten"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Heimwerkerbedarf"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Bürobedarf"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Bürobedarf bearbeiten"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Friseur"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Friseur bearbeiten"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Schuhe"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Schuhladen bearbeiten"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Spielzeug"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Spielzeuggeschäft bearbeiten"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Videoverleih"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Videogeschäft bearbeiten"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Chemische Reinigung"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Chemische Reinigung bearbeiten"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Waschsalon"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Waschsalon bearbeiten"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Camping (Outdoor)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Sportgeschäft bearbeiten"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Optiker bearbeiten"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Verkaufsautomat"
@@ -27692,5 +27843,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Automaten bearbeiten"
@@ -27698,306 +27849,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Automatenprodukte"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "Fahrscheine"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "Pläne des öffentlichen Nahverkehrs"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "Parkscheine"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "Essen"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "Getränke"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "Süßigkeiten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "Zigaretten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "Fotos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "Tiernahrung"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "Zeitungen"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "Spielzeug"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "Briefmarken"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-Karten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "Telefonkarten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "Karten/Belege"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "Fahrrad"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "Kondome"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "Tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "Hundekot-Tüten"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Kundenkarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Fleischer"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Fleischer bearbeiten"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Bäcker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Bäcker bearbeiten"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Blumenladen"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Blumenladen bearbeiten"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Bioladen"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Bioladen bearbeiten"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Spirituosen"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Spirituosengeschäft bearbeiten"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Getränke"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Getränkeladen bearbeiten"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Computergeschäft bearbeiten"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronikgeschäft"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Elektronikgeschäft bearbeiten"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Hifi-Geschäft bearbeiten"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Mobiliar"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Möbelgeschäft bearbeiten"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Gartenzentrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Gartenzentrum bearbeiten"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Haushaltswaren"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Haushaltswaren bearbeiten"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Heimwerkerbedarf"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Geschäft für Heimwerkerbedarf bearbeiten"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Bürobedarf"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Bürobedarf bearbeiten"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Friseur"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Friseur bearbeiten"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Schuhe"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Schuhladen bearbeiten"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Spielzeug"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Spielzeuggeschäft bearbeiten"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Videoverleih"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Videogeschäft bearbeiten"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Chemische Reinigung"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Chemische Reinigung bearbeiten"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Waschsalon"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Waschsalon bearbeiten"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Camping (Outdoor)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Laden für Camping- (Outdoor-)bedarf bearbeiten"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Sportgeschäft bearbeiten"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Optiker bearbeiten"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Geld"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -28005,14 +27948,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Bank bearbeiten"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Geldautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Wechselstube"
@@ -28020,5 +27963,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Wechselstube bearbeiten"
@@ -28026,15 +27969,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomat bearbeiten"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Gesundheit"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Arzt"
@@ -28042,18 +27985,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Arzt bearbeiten"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Zahnarzt"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Zahnarzt bearbeiten"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apotheke"
@@ -28061,5 +28004,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Apotheke bearbeiten"
@@ -28067,9 +28010,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Rezepteinlösung"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Krankenhaus"
@@ -28077,10 +28020,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Krankenhaus bearbeiten"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Notfallrettungspunkt"
@@ -28089,5 +28032,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Notfallrettungspunkt bearbeiten"
@@ -28096,20 +28039,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Punktname"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Internationale Nummer verwenden, z.B. +49-123-45678)"
@@ -28117,5 +28060,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Tierarzt"
@@ -28124,64 +28067,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Tierarzt bearbeiten"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografie"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Orte"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Kontinent bearbeiten"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Staat"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Staat bearbeiten"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Bundesland"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Bundesland bearbeiten"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Region bearbeiten"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Landkreis"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Landkreis bearbeiten"
@@ -28189,15 +28132,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Großstadt"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Großstadt bearbeiten"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Stadt"
@@ -28205,10 +28148,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Stadt bearbeiten"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Stadtteil"
@@ -28216,25 +28159,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Stadtteil bearbeiten"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Dorf"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Dorf bearbeiten"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Weiler"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Weiler bearbeiten"
@@ -28242,5 +28185,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Unbewohnter Ort"
@@ -28248,10 +28191,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Unbewohnten Ort bearbeiten"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Insel"
@@ -28259,10 +28202,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Insel bearbeiten"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Kleine Insel"
@@ -28270,5 +28213,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Kleine Insel bearbeiten"
@@ -28276,5 +28219,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Höhleneingang"
@@ -28282,10 +28225,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Höhleneingang bearbeiten"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Bergspitze"
@@ -28293,10 +28236,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Bergspitze bearbeiten"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Gletscher"
@@ -28304,10 +28247,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Gletscher bearbeiten"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkan"
@@ -28315,70 +28258,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Vulkan bearbeiten"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Staat"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Staatsgrenze bearbeiten"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Innerstaatlich"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Innerstaatliche Grenze bearbeiten"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Zivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Zivilrechtliche Grenze bearbeiten"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politisch"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Politische Grenze bearbeiten"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Nationalparkgrenze bearbeiten"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Landnutzung"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Baum"
@@ -28387,15 +28330,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Baum bearbeiten"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanischer Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Naturwald"
@@ -28404,5 +28347,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Naturwald bearbeiten"
@@ -28410,17 +28353,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Nadelwald"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "Laubwald"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "Mischwald"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Forst"
@@ -28429,14 +28372,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Forst bearbeiten"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Naturdenkmal & Reservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Naturdenkmal oder Reservat bearbeiten"
@@ -28444,25 +28387,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Geröll"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Geröll bearbeiten"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Buschland"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Buschland bearbeiten"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Gebirge"
@@ -28470,10 +28413,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Gebirge bearbeiten"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Heide"
@@ -28481,5 +28424,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Heide bearbeiten"
@@ -28487,5 +28430,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Bauernhof"
@@ -28494,45 +28437,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Bauernhof bearbeiten"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Ackerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Ackerland bearbeiten"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Wiese"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Wiese bearbeiten"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Weinberg"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Weinberg bearbeiten"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Schrebergärten"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Schrebergärten bearbeiten"
@@ -28540,25 +28483,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Garten"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Garten bearbeiten"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Grasfläche bearbeiten"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Dorfanger"
@@ -28566,10 +28509,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Dorfanger bearbeiten"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Öffentlicher Bereich"
@@ -28577,20 +28520,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Öffentlichen Bereich bearbeiten"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Park bearbeiten"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Erholungsgebiet"
@@ -28598,5 +28541,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Erholungsgebiet bearbeiten"
@@ -28604,15 +28547,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Wohngebiet"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Wohngebiet bearbeiten"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Kleiner Friedhof"
@@ -28620,9 +28563,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Kleinen Friedhof bearbeiten"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Friedhof"
@@ -28630,39 +28573,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Friedhof bearbeiten"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Einkaufsbereich"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Einkaufsbereich bearbeiten"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Gewerbegebiet"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Gewerbegebiet bearbeiten"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrie"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Industriegebiet bearbeiten"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Eisenbahngelände"
@@ -28670,15 +28613,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Eisenbahngelände bearbeiten"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militärgebiet"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Militärgebiet bearbeiten"
@@ -28686,50 +28629,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Baustellengebiet"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Baustelle bearbeiten"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Baulücke"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Baulücke bearbeiten"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Bauland"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Bauland bearbeiten"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Deponie"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Deponie bearbeiten"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Steinbruch"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Steinbruch bearbeiten"
@@ -28739,5 +28682,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Ein Multipolygon bearbeiten"
@@ -28746,10 +28689,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "Äußeres Segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "Inneres Segment"
@@ -28757,5 +28700,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Abbiegeeinschränkung"
@@ -28764,5 +28707,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Abbiegeeinschränkung bearbeiten"
@@ -28770,34 +28713,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Einschränkung"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "Nicht links abbiegen"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "Nicht rechts abbiegen"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "Nicht geradeaus"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "Wendeverbot"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "Nur rechts abbiegen"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "Nur links abbiegen"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "Nur geradeaus"
@@ -28806,15 +28749,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "Von Weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "Über Knoten oder Weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "Zu Weg"
@@ -28822,5 +28765,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Route"
@@ -28829,5 +28772,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Route bearbeiten"
@@ -28835,5 +28778,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Routentyp"
@@ -28924,5 +28867,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28932,17 +28875,17 @@
 msgstr "Fahrrad"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "Bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "Straße"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "Fähre"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "Ski"
@@ -29002,5 +28945,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -29009,9 +28952,9 @@
 msgstr "Fuß"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "Straßenbahn"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "Umleitung"
@@ -29025,10 +28968,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "U-Bahn"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbolbeschreibung"
@@ -29036,31 +28979,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Netzwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Routenstatus"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "geplant"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporär"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "Verbindung"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Farbe (hex)"
@@ -29069,32 +29012,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "Routenabschnitt"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "Vorwärts-Abschnitt"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "Rückwärts-Abschnitt"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "Haltepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "Vorwärts-Haltepunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "Rückwärts-Haltepunkt"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "Standard"
 
 #. mappaint style named "standard"
@@ -33118,4 +33136,7 @@
 msgstr "Sizilien - Italien"
 
+#~ msgid "Bikes"
+#~ msgstr "Fahrräder"
+
 #~ msgid "to"
 #~ msgstr "bis"
Index: /applications/editors/josm/i18n/po/el.po
===================================================================
--- /applications/editors/josm/i18n/po/el.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/el.po	(revision 20945)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 19:43+0000\n"
-"Last-Translator: bastik <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-19 14:05+0000\n"
+"Last-Translator: aitolos <Unknown>\n"
 "Language-Team: Greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1195,5 +1195,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Δεν μπορείτε να μετακινήσετε αντικείμενα εκτός κόσμου."
@@ -1511,5 +1511,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2273,9 +2273,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2356,22 +2356,22 @@
 msgstr "Τέλος σχεδιασμού."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Δημιουργία περιοχών"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -2379,5 +2379,5 @@
 "του ποντικιού."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2395,6 +2395,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2406,9 +2406,9 @@
 msgstr "Επιλέξτε"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Επιλέξτε, μετακινήστε και περιστρέψτε αντικείμενα"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2417,17 +2417,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Μετακίνηση στοιχείων"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Αναίρεση μετακίνησης"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2440,5 +2440,5 @@
 "Σίγουρα να μετακινηθούν;"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2446,5 +2446,5 @@
 "τετράγωνο"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2453,9 +2453,9 @@
 "συγχώνευση με το πλησιέστερο κόμβο."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Αφήστε το πλήκτρο του ποντικιού για να σταματήσετε την περιστροφή"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3179,5 +3179,5 @@
 msgstr "Εφαρμογή;"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3751,12 +3751,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "σύνδεση"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Χωρίς ετικέτα"
+msgstr ""
 
 #. teal
@@ -3937,5 +3935,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "σιδηρόδρομος"
@@ -5217,5 +5215,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "όλα"
@@ -5632,4 +5630,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5720,5 +5723,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Σχέσεις"
@@ -5820,9 +5823,9 @@
 msgstr "Επιλογή: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5831,5 +5834,5 @@
 "αριστερή εργαλειοθήκη."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6160,4 +6163,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6170,10 +6179,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6843,145 +6846,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Όνομα"
@@ -8200,10 +8203,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Τύπος"
@@ -8211,5 +8214,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8223,17 +8225,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "άγνωστο"
@@ -9001,11 +9002,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9022,14 +9025,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Επίπεδο"
@@ -9562,5 +9565,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Περιγραφή"
@@ -10622,55 +10625,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11147,5 +11150,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Αυτοκίνητο"
@@ -11167,16 +11170,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Ποδήλατο"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11206,12 +11210,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Πεζοί"
@@ -11911,12 +11915,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Όνομα οδού"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Μετρημένες τιμές"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14177,6 +14179,7 @@
 msgstr "Αποστολή ιχνών"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14267,5 +14270,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Παρεμβολή Διευθύνσεων"
@@ -14452,5 +14455,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14491,19 +14494,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Κτήρια"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14511,5 +14514,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14522,10 +14525,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14708,5 +14711,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16551,5 +16554,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Μέσα Μαζικής Μεταφοράς"
@@ -16601,5 +16604,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Σημεία αναφοράς"
@@ -17170,4 +17173,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Τύπος"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17324,4 +17344,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Περιορισμός στροφής"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Περιορισμός στροφής"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18080,5 +18114,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19358,7 +19392,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19375,5 +19409,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Λωρίδες κυκλοφορίας"
@@ -19391,4 +19425,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19396,9 +19431,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Μεγ. Ταχύτητα (χαω)"
@@ -19426,15 +19460,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19445,11 +19473,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Μονόδρομος"
@@ -19469,15 +19496,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19494,11 +19519,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19519,8 +19544,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19538,11 +19563,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Σήραγγα"
@@ -19562,6 +19587,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19579,11 +19604,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19603,6 +19628,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19620,11 +19645,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19762,5 +19787,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19769,12 +19794,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19782,13 +19810,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Πλάτος (μέτρα)"
@@ -19817,24 +19845,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Επιφάνεια"
@@ -19846,5 +19870,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19858,11 +19882,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19870,10 +19893,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19881,10 +19904,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19892,11 +19915,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19904,10 +19926,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19915,10 +19937,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "άλσος"
@@ -19926,10 +19948,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19937,11 +19959,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19949,10 +19970,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "χαλίκι"
@@ -19960,10 +19981,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19971,10 +19992,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19982,10 +20003,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19993,10 +20014,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "χόρτο"
@@ -20004,10 +20025,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "άμμος"
@@ -20015,10 +20036,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -20099,6 +20120,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Δρόμος (Άγνωστος Τύπος)"
@@ -20107,5 +20127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Επεξεργασία Δρόμου Άγνωστου Τύπου"
@@ -20113,6 +20133,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Υπό κατασκευή"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Κόμβος"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "κυκλικός κόμβος"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Περιορισμοί Δρόμου"
@@ -20121,15 +20170,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Επεξεργασία Περιορισμών Δρόμου"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Διόδια"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Αδιέξοδο"
@@ -20137,5 +20186,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Πρόσβαση"
@@ -20177,28 +20226,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ναι"
@@ -20211,10 +20259,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20228,10 +20276,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20255,97 +20303,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "αγροτικό"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "όχι"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20360,10 +20408,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Άλογο"
@@ -20379,10 +20427,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Μοτοσυκλέτα"
@@ -20397,19 +20445,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Αυτοκίνητο"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Ελαχ. ταχύτητα (χαω)"
@@ -20417,20 +20465,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Μεγ. βάρος (τόνοι)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Μέγιστο Ύψος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Μέγιστο Πλάτος (μέτρα)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Μέγιστο Μήκος (μέτρα)"
@@ -20438,5 +20486,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Κυκλικός κόμβος"
@@ -20447,5 +20495,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20465,10 +20513,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Αυτοκινητόδρομος"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20490,10 +20538,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20515,10 +20563,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "πρωτεύων"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20540,5 +20588,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20553,9 +20601,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "τριτεύων"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "αταξινόμητος"
@@ -20569,9 +20617,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "Οικιστική"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20601,10 +20649,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20634,5 +20682,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20644,10 +20692,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Επεξεργασία Γέφυρας"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Σήραγγα"
@@ -20655,39 +20703,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Υπό κατασκευή"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Επεξεργασία οδού ταχείας κυκλοφορίας υπό κατασκευή"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Κόμβος"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "κυκλικός κόμβος"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20696,73 +20715,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "πεζοπορία"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Μονοπάτι"
@@ -20771,38 +20758,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Επεξεργασία μονοπατιού"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "πεζοπορία"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Σκι"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -20811,5 +20828,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20817,5 +20834,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20823,5 +20840,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20839,11 +20856,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Επεξεργασία ποδηλατόδρομου"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20851,5 +20868,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20857,5 +20874,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20863,5 +20880,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20870,15 +20887,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
-msgstr ""
-
-#: build/trans_presets.java:600
-msgid "Bikes"
 msgstr ""
 
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Σκαλοπάτια"
@@ -20888,10 +20901,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Επεξεργασία σκαλοπατιών"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Κόμβος Αυτοκινητοδρόμου"
@@ -20899,15 +20912,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Επεξεργασία Κόμβου Αυτοκινητοδρόμου"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Αριθμός"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Υπηρεσίες"
@@ -20915,5 +20928,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -20953,17 +20966,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Λειτουργός"
@@ -20972,5 +20985,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Σηματοδότης"
@@ -20980,5 +20993,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Τύπος διάβασης πεζών"
@@ -20987,27 +21000,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "σηματοδότες"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "νησίδα"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -21015,6 +21028,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -21023,11 +21036,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21035,30 +21048,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21066,5 +21079,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Διάβαση Πεζών"
@@ -21073,14 +21086,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Επεξεργασία Διάβασης Πεζών"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21088,33 +21101,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21122,5 +21135,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21128,5 +21141,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Μικρός Κυκλικός Κόμβος"
@@ -21137,14 +21150,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "δεξιόστροφα"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21154,5 +21167,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Όρια πόλης"
@@ -21160,15 +21173,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Επεξεργασία πινακίδας ορίων πόλης"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Δεύτερο Όνομα"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Κάμερα ελέγχου ταχύτητας"
@@ -21177,5 +21190,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Τηλέφωνο εκτάκτου ανάγκης"
@@ -21183,5 +21196,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21189,5 +21202,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21195,5 +21208,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21203,10 +21216,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21214,5 +21227,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Ορεινό πέρασμα"
@@ -21220,5 +21233,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Επεξεργασία ορεινού Περάσματος"
@@ -21230,7 +21243,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Υψόμετρο"
@@ -21238,5 +21251,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Εμπόδια"
@@ -21244,5 +21257,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21250,5 +21263,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21293,16 +21306,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Επιτρεπόμενα οχήματα:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21311,5 +21324,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21317,5 +21330,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21323,10 +21336,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21334,15 +21347,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Σταθμός Διοδίων"
@@ -21350,5 +21363,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Επεξεργασία Σταθμού Διοδίων"
@@ -21356,10 +21369,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Συνοριακός Σταθμός"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Επεξεργασία Συνοριακού Σταθμού"
@@ -21369,5 +21382,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Φράκτης θάμνων"
@@ -21378,22 +21391,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Φράκτης"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Τοίχος"
@@ -21401,5 +21414,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21408,5 +21421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21418,10 +21431,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Είσοδος"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Επεξεργασία Εισόδου"
@@ -21429,5 +21442,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Πύλη"
@@ -21435,50 +21448,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Επεξεργασία Πύλης"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21486,25 +21499,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21515,11 +21528,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Νερό"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Πηγή"
@@ -21527,5 +21540,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Επεξεργασία πηγής"
@@ -21533,5 +21546,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Αποχέτευση"
@@ -21539,10 +21552,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Επεξεργασία Αποχέτευσης"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Χαντάκι"
@@ -21550,10 +21563,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Επεξεργασία Χαντακιού"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Υδατόρρευμα"
@@ -21561,10 +21574,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Επεξεργασία Υδατορρεύματος"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Κανάλι"
@@ -21572,10 +21585,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Επεξεργασία Καναλιού"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Ποταμός"
@@ -21585,5 +21598,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Επεξεργασία ποταμού"
@@ -21591,15 +21604,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Επεξεργασία νερού"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Ξηρά"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Επεξεργασία νερού"
@@ -21607,15 +21620,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Λεκάνη"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Ταμιευτήρας"
@@ -21623,15 +21636,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Επεξεργασία Ταμιευτήρα"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Καλυμένος Ταμιευτήρας"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Επεξεργασία Καλυμένου Ταμιευτήρα"
@@ -21639,5 +21652,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Όχθη ποταμού"
@@ -21646,10 +21659,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Επεξεργασία όχθης ποταμού"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21660,14 +21673,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Βάλτος"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21681,35 +21694,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "έλος"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Λάσπη"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Επεξεργασία λασπότοπου"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Παραλία"
@@ -21717,20 +21730,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Επεξεργασία παραλίας"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Όρμος"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Επεξεργασία όρμου"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Λόφος"
@@ -21738,10 +21751,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Επεξεργασία λόφου"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Ακτογραμμή"
@@ -21749,5 +21762,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Επεξεργασία Ακτογραμμής"
@@ -21755,5 +21768,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr ""
@@ -21761,5 +21774,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21768,5 +21781,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21774,10 +21787,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -21785,5 +21798,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21791,5 +21804,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Φράγμα"
@@ -21797,15 +21810,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Επεξεργασία Φweirράγματος"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Σημείο Υδατοδιαδρομής"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr ""
@@ -21814,5 +21827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Φράγμα εκτροπής"
@@ -21820,20 +21833,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Επεξεργασία φράγματος εκτροπής"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Καταρράκτης"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Επεξεργασία Καταράκτη"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21842,15 +21855,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Αποβάθρα"
@@ -21858,10 +21871,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Επεξεργασία Αποβάθρας"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21869,10 +21882,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21882,20 +21895,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Μεταφορές"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Σιδηρόδρομος"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Σιδηροτροχιά"
@@ -21903,5 +21916,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Επεξεργασία σιδηροτροχιάς"
@@ -21931,86 +21944,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22022,8 +21960,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22037,29 +21975,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22072,8 +22010,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22144,8 +22082,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22157,8 +22095,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Τάση ρεύματος"
@@ -22171,8 +22109,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22185,23 +22123,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22209,50 +22147,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Υπόγειος Σιδηρόδρομος"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Επεξεργασία υπογείου σιδηροδρόμου"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Τραμ"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Επεξεργασία Τραμ"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22260,5 +22198,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22267,10 +22205,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22279,9 +22217,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22290,5 +22228,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Ισόπεδη διάβαση"
@@ -22297,5 +22235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Φυλασόμενη Διάβαση"
@@ -22305,5 +22243,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Είδος Διάβασης"
@@ -22311,5 +22249,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Περιστρεφόμενη πλατφόρμα"
@@ -22318,5 +22256,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22325,10 +22263,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22336,10 +22274,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22347,10 +22285,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22358,10 +22296,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22369,10 +22307,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22381,5 +22319,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22387,5 +22325,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22394,5 +22332,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22400,5 +22338,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Καύσιμα"
@@ -22408,62 +22346,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Επεξεργασία καυσίμων"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22521,32 +22459,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Ώρες Λειτουργείας"
@@ -22605,165 +22543,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22780,5 +22718,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22788,5 +22726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Επεξεργασία Χώρου Στάθμευσης"
@@ -22797,25 +22735,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Αριθμός Αναφοράς"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "πολυόροφο"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "επιφάνεια"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "υπόγειο"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22824,48 +22762,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Κόστος"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Θέσεις αναπήρων"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Πλυντήριο"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Επεξεργασία πλυντηρίου"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Συνεργείο Αυτοκινήτων"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Επεξεργασία Συνεργείου Αυτοκινήτων"
@@ -22873,5 +22811,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Ενοικίαση"
@@ -22880,10 +22818,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Επεξεργασία Ενοικίασης"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Κοινή χρήση"
@@ -22891,5 +22829,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Επεξεργασία κοινής χρήσης αυτοκινήτου"
@@ -22897,10 +22835,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Επεξεργασία χώρου στάθμευσης ποδηλάτων"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Χωρητικότητα"
@@ -22909,10 +22847,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Επεξεργασία Ενοικίασης ποδηλάτων"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22922,5 +22860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22928,5 +22866,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22934,5 +22872,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22940,5 +22878,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22946,5 +22884,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Στάση Τραμ"
@@ -22953,5 +22891,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Επεξεργασία Στάσης Τραμ"
@@ -22959,5 +22897,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22966,5 +22904,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22976,5 +22914,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22982,10 +22920,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Είσοδος υπογείου σιδηρόδρομου"
@@ -22994,10 +22932,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Επεξεργασία εισόδου υπογείου σιδηρόδρομου"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Αναπηρικό καρότσι"
@@ -23006,5 +22944,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Σταθμός Λεωφορείων"
@@ -23013,5 +22951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Επεξεργασία Σταθμού Λεωφορείων"
@@ -23019,5 +22957,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Στάση Λεωφορείου"
@@ -23027,5 +22965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Επεξεργασία Στάσης Λεωφορείου"
@@ -23034,6 +22972,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Καταφύγιο"
@@ -23041,19 +22979,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Παγκάκι"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -23061,5 +22999,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Ταξί"
@@ -23067,5 +23005,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Επεξεργασία σταθμού ταξί"
@@ -23073,10 +23011,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Αεροδρόμιο"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23084,5 +23022,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23090,10 +23028,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23102,5 +23040,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23108,5 +23046,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23114,5 +23052,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23120,5 +23058,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23126,5 +23064,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23132,5 +23070,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23140,5 +23078,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23148,5 +23086,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23157,6 +23095,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Φάρος"
@@ -23166,5 +23104,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23173,5 +23111,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23179,5 +23117,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23185,15 +23123,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Ταξίδι"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Διαμονή"
@@ -23205,5 +23143,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Ξενοδοχείο"
@@ -23212,15 +23150,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Επεξεργασία Ξενοδοχείου"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Αστέρια"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23228,20 +23166,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Ξενώνας"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Επεξεργασία Ξενώνα"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Σαλέ"
@@ -23249,10 +23187,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Επεξεργασία Σαλέ"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23260,30 +23198,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Χώρος Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Επεξεργασία Χώρου Τροχόσπιτων"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Χώρος Κάμπινγκ"
@@ -23291,10 +23229,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Επεξεργασία Χώρου Κάμπινγκ"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Φαγητό+Ποτά"
@@ -23305,5 +23243,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Εστιατόριο"
@@ -23311,5 +23249,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Επεξεργασία Εστιατορίου"
@@ -23317,5 +23255,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Κουζίνα"
@@ -23323,73 +23261,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "ιταλική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "κινέζικη"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "ελληνική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "γερμανική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "ινδική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "τοπική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "τουρκική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "ασιατική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "ταϊλανδέζικη"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "μεξικάνικη"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "ιαπωνική"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -23397,17 +23335,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Επεξεργασία Εστιατορίου Fast Food"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Καφέ"
@@ -23415,9 +23353,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Επεξεργασία Καφέ"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -23425,18 +23363,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Επεξεργασία Pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Μπυραρία"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Επεξεργασία Μπυραρίας"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Μπαρ"
@@ -23444,9 +23382,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Επεξεργασία Μπαρ"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Νυχτερινό Κέντρο"
@@ -23454,24 +23392,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Νυχτερινό Κέντρο"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Τουρισμός"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Μουσείο"
@@ -23479,9 +23417,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Επεξεργασία Μουσείου"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Ζωολογικός Κήπος"
@@ -23490,9 +23428,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Επεξεργασία Ζωολογικού Κήπου"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr ""
@@ -23500,24 +23438,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Πύργος Παρατήρησης"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Θεματικό Πάρκο"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Επεξεργασία Θεματικού Πάρκου"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr ""
@@ -23525,5 +23463,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -23531,19 +23469,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Γραφείο Πληροφοριών"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Χάρτης"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23581,5 +23519,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23587,28 +23525,28 @@
 msgstr "οδός"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23618,5 +23556,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23624,5 +23562,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Πεζοπορία"
@@ -23630,6 +23568,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ποδηλασία"
@@ -23637,5 +23575,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23643,6 +23581,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -23650,5 +23588,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23656,46 +23594,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "ιστορία"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23703,29 +23641,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23733,25 +23671,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Τζάκι"
 
 #. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
 msgid "Historic Places"
 msgstr "Ιστορικά Σημεία"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Κάστρο"
@@ -23760,19 +23698,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Επεξεργασία Κάστρου"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ερείπια"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Επεξεργασία Ερειπίων"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Αρχαιολογικός Χώρος"
@@ -23781,9 +23719,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Επεξεργασία Αρχαιολογικού Χώρου"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Πεδίο Μάχης"
@@ -23791,10 +23729,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Επεξεργασία Πεδίου Μάχης"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23802,5 +23740,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23808,15 +23746,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Μνημείο"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Επεξεργασία Μνημείου"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Ηρώο"
@@ -23824,55 +23762,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Επεξεργασία Ηρώου"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Αναψυχή"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Παιδική Χαρά"
@@ -23880,35 +23818,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Επεξεργασία Παιδικής Χαράς"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Ψάρεμα"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Επεξεργασία Ψαρέματος"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Αθλητικά"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Χώροι Άθλησης"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Στάδιο"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Επεξεργασία Σταδίου"
@@ -23922,6 +23860,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "επιλέξτε άθλημα:"
@@ -24313,6 +24251,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24346,225 +24284,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "τοξοβολία"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "Καλαθοσφαίρηση"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "Κανόε"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "αναρρήχηση"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ποδηλασία"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "κυνοδρομίες"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "σκοποβολή"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "ποδόσφαιρο"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "κολύμβηση"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "επιτραπέζια αντισφαίρηση"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "αντισφαίρηση"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Αθλητικό Κέντρο"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Επεξεργασία Αθλητικού Κέντρου"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Μίνι Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Επεξεργασία Μίνι Golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Άθλημα"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Πολλαπλά"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24603,21 +24541,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "τύπος"
@@ -24656,203 +24594,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "αθλητικό κέντρο"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "στάδιο"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Τοξοβολία"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Επεξεργασία τοξοβολίας"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Αναρρήχηση"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Επεξεργασία Αναρρήχησης"
 
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr "Επεξεργασία Ποδηλασίας"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Κυνοδρομίες"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Επεξεργασία Κυνοδρομιών"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ιππικό"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Επεξεργασία Ιππικού"
 
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
+#: build/trans_presets.java:2001
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
-#: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Μηχανοκίνητα Αθλήματα"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Επεξεργασία Μηχανοικίνητων  Αθλημάτων"
 
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
+#: build/trans_presets.java:2019
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
-#: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Κολύμβηση"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Επεξεργασία Κολύμβησης"
@@ -24860,52 +24798,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Δυσκολία"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "αρχαρίων"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "εύκολη"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Σκοποβολή"
@@ -24913,177 +24851,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Επεξεργασία Σκοποβολής"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr ""
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Επεξεργασία Ποδοσφαίρου"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Ποδόσφαιρο"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr ""
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Επεξεργασία Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Καλαθοσφαίρηση"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Επεξεργασία Καλαθοσφαίρησης"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Επεξεργασία Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2091
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Επεξεργασία Hockey"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Επεξεργασία Rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Επιτραπέζια Αντισφαίριση"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Επεξεργασία Επιτραπέζιας Αντισφαίρισης"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Αντισφαίριση"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Επεξεργασία Αντισφαίρισης"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Κτήριο"
@@ -25091,5 +25029,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Δημόσιο Κτήριο"
@@ -25097,10 +25035,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Επεξεργασία Δημοσίου Κτηρίου"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Δημαρχείο"
@@ -25108,10 +25046,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Επεξεργασία Δημαρχείου"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Πρεσβεία"
@@ -25119,10 +25057,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Επεξεργασία Πρεσβείας"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Δικαστήρια"
@@ -25131,10 +25069,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Επεξεργασία Δικαστηρίων"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Φυλακή"
@@ -25143,10 +25081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Επεξεργασία Φυλακής"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Αστυνομία"
@@ -25156,10 +25094,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Επεξεργασία Αστυνομίας"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Πυροσβεστείο"
@@ -25168,10 +25106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Επεξεργασία Πυροσβεστείου"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Ταχυδρομείο"
@@ -25179,5 +25117,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Επεξεργασία Ταχυδρομείου"
@@ -25185,15 +25123,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Νηπιαγωγείο"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Επεξεργασία Νηπιαγωγείου"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Σχολείο"
@@ -25201,10 +25139,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Επεξεργασία Σχολείου"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Πανεπιστήμιο"
@@ -25212,10 +25150,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Επεξεργασία Πανεπιστημίου"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Κολέγιο"
@@ -25223,5 +25161,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Επεξεργασία Κολεγίου"
@@ -25229,5 +25167,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Κινηματογράφος"
@@ -25236,10 +25174,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Επεξεργασία Κινηματογράφου"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Βιβλιοθήκη"
@@ -25248,9 +25186,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Επεξεργασία Βιβλιοθήκης"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Κέντρο Τεχνών"
@@ -25258,10 +25196,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Επεξεργασία Κέντρου Τεχνών"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Θέατρο"
@@ -25270,10 +25208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Επεξεργασία Θεάτρου"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Τόπος Λατρείας"
@@ -25283,5 +25221,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Επεξεργασία Τόπου Λατρείας"
@@ -25290,6 +25228,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Θρησκεία"
@@ -25298,66 +25236,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "βουδισμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "χριστιανισμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "ινδουϊσμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "ιουδαϊσμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "μουσουλμανισμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "ταοϊσμός"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Δόγμα"
@@ -25366,81 +25304,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "αγγλικανικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "βαπτιστικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "καθολικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "ευαγγελικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "μαρτύρων του Ιεχοβά"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "λουθερανικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ορθόδοξο"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "πεντηκωστής"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "προτεσταντικό"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Διευθύνσεις"
@@ -25449,5 +25387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Επεξεργασία διεύθυνσης"
@@ -25455,5 +25393,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Αριθμός σπιτιού"
@@ -25461,25 +25399,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Όνομα Σπιτιού"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Όνομα οδού"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Όνομα πόλης"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Ταχυδρομικός Κώδικας"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Κωδικός χώρας"
@@ -25488,5 +25426,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Επεξεργασία Παρεμβολής Διευθύνσεων"
@@ -25494,61 +25432,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Τρόπος Αρίθμησης"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "Μονά"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "Ζυγά"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Πύργος"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Επεξεργασία Πύργου"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25556,25 +25494,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Υδραγωγείο"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Επεξεργασία Υδραγωγείου"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Μετρητής Αερίου"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Επεξεργασία Μετρητή Αερίου"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Φάρος"
@@ -25582,10 +25520,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Ανεμόμυλος"
@@ -25593,10 +25531,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Επεξεργασία Ανεμόμυλου"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Αγωγός"
@@ -25605,41 +25543,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Επεξεργασία Αγωγού"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "Αέριο"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Θέση"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Βιολογικός Καθαρισμός"
@@ -25649,10 +25587,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Επεξεργασία Βιολογικού Καθαρισμού"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Γερανός"
@@ -25660,5 +25598,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Επεξεργασία Γερανού"
@@ -25666,10 +25604,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Επεξεργασία Φάρου"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25677,10 +25615,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Παρακολούθηση"
@@ -25688,23 +25626,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Επεξεργασία Κάμερας Παρακολούθησης"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Γεννήτρια Ρεύματος"
@@ -25714,35 +25652,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Επεξεργασία Γεννήτριας Ρεύματος"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "Αέρας"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "Νερό"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "Πυρηνικό"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "Λιγνίτης"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "Φωτοβολταϊκό"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Σταθμός Παραγωγής Ρεύματος"
@@ -25751,10 +25689,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Επεξεργασία Σταθμού Παραγωγής Ρεύματος"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Υποσταθμός Ρεύματος"
@@ -25763,5 +25701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Επεξεργασία Υποσταθμού Ρεύματος"
@@ -25769,10 +25707,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Πυλώνας Ρεύματος"
@@ -25783,23 +25721,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Επεξεργασία Πυλώνα Ρεύματος"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Αγωγός Μεταφοράς Ρεύματος"
@@ -25808,74 +25746,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Επεξεργασία Αγωγού Μεταφοράς Ρεύματος"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "μονή"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "διπλή"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "τριπλή"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "τετραπλή"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Τουαλέτες"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Σημείωση"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Γραμματοκιβώτιο"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Τηλέφωνο"
@@ -25884,5 +25822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Επεξεργασία Τηλεφώνου"
@@ -25890,5 +25828,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Κέρματα"
@@ -25896,5 +25834,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Χαρτονομίσματα"
@@ -25902,5 +25840,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25908,5 +25846,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Χρεωστικές Κάρτεσ"
@@ -25914,15 +25852,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Πιστωτικές Κάρτες"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Τηλεκάρτες"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Ανακύκλωση"
@@ -25931,5 +25869,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Επεξεργασία σταθμού Ανακύκλωσης"
@@ -25937,35 +25875,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Μπαταρίες"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Τενεκεδάκια"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Ρούχα"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Γυαλί"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Χαρτί"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Μέταλλα"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25973,5 +25911,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25980,31 +25918,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Υλικό"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "πέτρα"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "πλαστικό"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Χρώμα"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "μαύρο"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "καφέ"
@@ -26083,5 +26021,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26091,31 +26029,31 @@
 msgstr "πράσινο"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "κόκκινο"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "μπλε"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "γκρι"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "λευκό"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Σύνολο Καθισμάτων"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26124,30 +26062,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Ύψος"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "χαμηλό"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "μισό"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "πλήρες"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Κρυψώνα"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Κλειδαριά"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Συντριβάνι"
@@ -26156,10 +26094,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Επεξεργασία Συντριβανίου"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Πόσιμο Νερό"
@@ -26168,10 +26106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Επεξεργασία πόσιμου νερού"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26180,5 +26118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26186,5 +26124,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Βρεφοδόχος"
@@ -26192,15 +26130,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Επεξεργασία Βρεφοδόχου"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Καταστήματα"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26208,10 +26146,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Επεξεργασία Καταστήματος"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26220,28 +26158,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Επεξεργασία Καταστήματος Ποδηλάτων"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Επεξεργασία Supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26249,9 +26187,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Περίπτερο"
@@ -26259,27 +26197,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Επεξεργασία Περιπτέρου"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Ταξιδιωτικό Γραφείο"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Επεξεργασία Ταξιδιωτικού Γραφείου"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Κρεοπωλείο"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Επεξεργασία Κρεοπωλείου"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Φούρνος"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Επεξεργασία Φούρνου"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Ανθοπωλείο"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Επεξεργασία Ανθοπωλείου"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Βιολογικά"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Επεξεργασία Καταστήματος Βιολογικών"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Κάβα Ποτών"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Επεξεργασία Κάβας Ποτών"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Ποτά"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Υπολογιστές"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Ηλεκτρονικά"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Ηχοσυστήματα"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Έπιπλα"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Επεξεργασία Καταστήματος Επίπλων"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Είδη Κήπου"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Σιδηρικά"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Χαρτικά"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Επεξεργασία Χαρτοπωλείου"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Κομμωτήριο"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Επεξεργασία Κομμωτηρίου"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Υποδήματα"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Επεξεργασία Υποδηματοπωλείου"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Παιχνίδια"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Στεγνοκαθαριστήριο"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Πλυντήριο"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Επεξεργασία πλυντηρίου"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Επεξεργασία Καταστήματος Αθλητικών"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Οπτικός"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Επεξεργασία Οπτικού"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Μηχάνημα Πώλησης"
@@ -26287,5 +26439,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Επεξεργασία Μηχανήματος Πώλησης"
@@ -26293,306 +26445,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Πωλούμενα Προϊόντα"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "εισητήρια Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "χάρτες Μέσων Μαζικής Μεταφοράς"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "εισιτήρια Στάθμευσης"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "φαγητό"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "ποτά"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "γλυκά"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "τσιγάρα"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "φωτογραφίες"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "τροφές ζώων"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "εφημερίδες"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "Παιχνίδια"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "Γραμματόσημα"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "Κάρτες SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "κουπόνια"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "ποδήλατο"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "Προφυλακτικά"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Κρεοπωλείο"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Επεξεργασία Κρεοπωλείου"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Φούρνος"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Επεξεργασία Φούρνου"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Ανθοπωλείο"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Επεξεργασία Ανθοπωλείου"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Βιολογικά"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Επεξεργασία Καταστήματος Βιολογικών"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Κάβα Ποτών"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Επεξεργασία Κάβας Ποτών"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Ποτά"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Υπολογιστές"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Επεξεργασία Καταστήματος Υπολογιστών"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Ηλεκτρονικά"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Επεξεργασία Καταστήματος Ηλεκτρονικών"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Ηχοσυστήματα"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Επεξεργασία Καταστήματος Ηχοσυστημάτων"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Έπιπλα"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Επεξεργασία Καταστήματος Επίπλων"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Είδη Κήπου"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Επεξεργασία Καταστήματος Ειδών Κήπου"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Σιδηρικά"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Επεξεργασία Καταστήματος Σιδηρικών"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Χαρτικά"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Επεξεργασία Χαρτοπωλείου"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Κομμωτήριο"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Επεξεργασία Κομμωτηρίου"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Υποδήματα"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Επεξεργασία Υποδηματοπωλείου"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Παιχνίδια"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Επεξεργασία Καταστήματος Παιχνιδιών"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Στεγνοκαθαριστήριο"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Επεξεργασία Στεγνοκαθαριστηρίου"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Πλυντήριο"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Επεξεργασία πλυντηρίου"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Επεξεργασία Καταστήματος Αθλητικών"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Οπτικός"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Επεξεργασία Οπτικού"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Μετρητά"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Τράπεζα"
@@ -26600,14 +26544,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Επεξεργασία Τράπεζας"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "ΑΤΜ"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Συναλλακτήριο"
@@ -26615,5 +26559,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Επεξεργασία Συναλλακτηρίου"
@@ -26621,15 +26565,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Επεξεργασία ΑΤΜ"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Υγεία"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Ιατροί"
@@ -26637,18 +26581,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Επεξεργασία Ιατρών"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Οδοντίατρος"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Επεξεργασία Οδοντιάτρου"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Φαρμακείο"
@@ -26656,5 +26600,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Επεξεργασία Φαρμακείου"
@@ -26662,9 +26606,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Νοσοκομείο"
@@ -26672,10 +26616,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Επεξεργασία Νοσοκομειου"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26684,5 +26628,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26691,20 +26635,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Αριθμός Σημείου"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Όνομα Σημείου"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Αριθμός Τηλεφώνου"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Χρησιμοποιήστε διεθνή κωδικό, όπως +12-345-67890)"
@@ -26712,5 +26656,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Κτηνιατρίο"
@@ -26719,64 +26663,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Επεξεργασία Κτηνιατρίου"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Γεωγραφία"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Τοποθεσίες"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Ήπειρος"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Επεξεργασία Ηπείρου"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Χώρα"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Επεξεργασία Χώρας"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Πολιτεία"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Επεξεργασία Πολιτείας"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Περιοχή"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Επεξεργασία Περιοχής"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Περιφέρεια"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Επεξεργασία Περιφέρειας"
@@ -26784,15 +26728,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Πόλη"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Επεξεργασία Πόλης"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Κωμόπολη"
@@ -26800,10 +26744,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Επεξεργασία Κωμόπολης"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Προάστιο"
@@ -26811,25 +26755,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Επεξεργασία Προαστίου"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Χωριό"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Επεξεργασία Χωριού"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Οικισμός"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Επεξεργασία Οικισμού"
@@ -26837,5 +26781,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Τοπονύμιο/Περιοχή"
@@ -26843,10 +26787,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Επεξεργασία Τοπονυμίου/Περιοχής"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Νησί"
@@ -26854,10 +26798,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Επεξεργασία Νησιού"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Νησίδα"
@@ -26865,5 +26809,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Επεξεργασία Νησίδας"
@@ -26871,5 +26815,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Είσοδος σπηλαίου"
@@ -26877,10 +26821,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Επεξεργασία εισόδου σπηλαίου"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Κορυφή"
@@ -26888,10 +26832,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Επεξεργασία κορυφής"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Παγετώνας"
@@ -26899,10 +26843,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Επεξεργασία παγετώνα"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Ηφαίστειο"
@@ -26910,70 +26854,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Επεξεργασία ηφαιστείου"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Όρια"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Εθνικό"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Επεξεργασία Εθνικού Συνόρου"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Διοικητικό"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Επεξεργασία Διοικητικού Ορίου"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Αστικό"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Επεξεργασία Αστικού Ορίου"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Πολιτικό"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Επεξεργασία Πολιτικού Ορίου"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Εθνικό πάρκο"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Επεξεργασία Ορίου Εθνικού Δρυμού"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Χρήση γής"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Δένδρο"
@@ -26982,15 +26926,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Επεξεργασία δένδρου"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Βοτανικό όνομα"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Άλσος"
@@ -26999,5 +26943,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Επεξεργασία άλσους"
@@ -27005,17 +26949,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Κωνοφόρο"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "φυλλοβόλα"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "Μικτό"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Δάσος"
@@ -27024,14 +26968,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Επεξεργασία Δάσους"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Εθνικός Δρυμός"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Επεξεργασία Εθνικού Δρυμού"
@@ -27039,25 +26983,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -27065,10 +27009,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -27076,5 +27020,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -27082,5 +27026,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -27089,45 +27033,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Χωράφι"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Επεξεργασία Χωραφιού"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Λειβάδι"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Επεξεργασία Λειβαδιού"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Αμπελώνας"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Επεξεργασία Αμπελώνα"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Κλήροι"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27135,25 +27079,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Κήπος"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Επεξεργασία Κήπου"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Γρασίδι"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27161,10 +27105,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27172,20 +27116,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Πάρκο"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Επεξεργασία Πάρκου"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Χώρος αναψυχής"
@@ -27193,5 +27137,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Επεξεργασία χώρου αναψυχής"
@@ -27199,15 +27143,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Οικιστική περιοχή"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Επεξεργασία οικιστικής περιοχής"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Νεκροταφείο"
@@ -27215,9 +27159,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Επεξεργασία Νεκροταφείου"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Κοιμητήριο"
@@ -27225,39 +27169,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Επεξεργασία χρήσης γης κοιμητηρίου"
 
+#: build/trans_presets.java:3114
+msgid "Retail"
+msgstr ""
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
 #: build/trans_presets.java:3121
-msgid "Retail"
-msgstr ""
-
-#. item "Land use/Retail"
-#: build/trans_presets.java:3122
-msgid "Edit Retail Landuse"
-msgstr ""
-
-#. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
-msgid "Commercial"
-msgstr ""
-
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3128
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Βιομηχανική"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27265,15 +27209,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Στρατιωτικά"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27281,50 +27225,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Εγοτάξιο"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Επεξεργασία εργοταξίου"
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "ΧΥΤΑ"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Επεξεργασία Χρήσης γης ΧΥΤΑ"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Λατομείο"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Επεξεργασία Λατομείου"
@@ -27334,5 +27278,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27341,10 +27285,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "εξωτερικός τομέας"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "εσωτερικός τομέας"
@@ -27352,5 +27296,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Περιορισμός στροφής"
@@ -27359,5 +27303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Επεξεργασία περιορισμού στροφής"
@@ -27365,34 +27309,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Περιορισμός"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "όχι_αριστερή_στροφή"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "όχι_δεξιά_στροφή"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "όχι_ευθεία"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "όχι_αναστροφή"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "μόνο_δεξιά_στροφή"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "μόνο_αριστερή_στροφή"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "μόνο_ευθεία"
@@ -27401,15 +27345,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27417,5 +27361,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Διαδρομή"
@@ -27424,5 +27368,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Επεξεργασία Διαδρομής"
@@ -27430,5 +27374,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Τύπος Διαδρομής"
@@ -27519,5 +27463,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27527,17 +27471,17 @@
 msgstr "ποδήλατο"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "λεωφορείο"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "δρόμος"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "Πορθμείο"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "σκι"
@@ -27597,5 +27541,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27604,9 +27548,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "τραμ"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "παράκαμψη"
@@ -27620,10 +27564,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "υπόγειος"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Περιγραφή συμβόλου"
@@ -27631,31 +27575,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Δίκτυο"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "προτεινόμενο"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "εναλλακτικό"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "προσωρινό"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "σύνδεση"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Χρώμα (δεκαεξαδικό)"
@@ -27664,31 +27608,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "τμήμα διαδρομής"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
@@ -27841,5 +27860,5 @@
 #: build/trans_style.java:633 build/trans_style.java:4087
 msgid "deprecated"
-msgstr ""
+msgstr "παρωχημένο"
 
 #. color foot
Index: /applications/editors/josm/i18n/po/en_AU.po
===================================================================
--- /applications/editors/josm/i18n/po/en_AU.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/en_AU.po	(revision 20945)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
 "PO-Revision-Date: 2010-03-28 15:27+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1201,5 +1201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Cannot move objects outside of the world."
@@ -1530,5 +1530,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2304,9 +2304,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2389,26 +2389,26 @@
 msgstr "Finish drawing."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extrude"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Create areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extrude Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Move a segment along its normal, then release the mouse button."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Draw a rectangle of the desired size, then release the mouse button."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2430,6 +2430,6 @@
 "+release to synchronise audio at that point."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2441,9 +2441,9 @@
 msgstr "Select"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Select, move and rotate objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2452,17 +2452,17 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Move elements"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Move them"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Undo move"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2475,19 +2475,19 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3244,5 +3244,5 @@
 msgstr "Apply?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3851,17 +3851,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "connection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "untagged"
+msgstr ""
 
 #. teal
@@ -4045,5 +4042,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "railway"
@@ -5383,5 +5380,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "all"
@@ -5820,4 +5817,9 @@
 msgstr "Filter mode"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5908,5 +5910,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relations"
@@ -6008,9 +6010,9 @@
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6018,5 +6020,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -6356,4 +6358,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6366,10 +6374,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7039,145 +7041,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Name"
@@ -8461,10 +8463,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Type"
@@ -8472,5 +8474,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8484,17 +8485,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "unknown"
@@ -9337,11 +9337,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9358,14 +9360,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Layer"
@@ -9941,5 +9943,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Description"
@@ -11079,26 +11081,26 @@
 msgstr "Close the dialogue and accept the Access Token"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Warning: failed to cancel running OAuth operation"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Retrieving OAuth Request Token from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Retrieving OAuth Access Token from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "OSM website did not return a session cookie in response to ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11106,29 +11108,29 @@
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Failed to authorise OAuth request  ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Authorising OAuth Request token ''{0}'' at the OSM website ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Initialising a session at the OSM website..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Authenticating the session for user ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Authorising request token ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11650,5 +11652,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Car"
@@ -11670,16 +11672,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicycle"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11709,12 +11712,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Foot"
@@ -12451,17 +12454,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Advanced OAuth parameters"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Street name"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Measured values"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14939,6 +14939,7 @@
 msgstr "Upload Traces"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibility"
@@ -15029,5 +15030,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15214,5 +15215,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Create building"
@@ -15253,19 +15254,19 @@
 msgstr "Set width of building"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15273,5 +15274,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15287,10 +15288,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Select Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15334,7 +15335,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Guadeloupe Ste-Anne cache file (.UTM2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15485,5 +15485,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17364,5 +17364,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Public Transport"
@@ -17414,5 +17414,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Waypoints"
@@ -17987,4 +17987,22 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Type"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "From ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -18141,4 +18159,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Create Michigan left turn restriction"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Turn restriction"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18901,5 +18933,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20256,7 +20288,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Reference"
@@ -20273,5 +20305,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Lanes"
@@ -20289,4 +20321,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20294,9 +20327,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -20324,15 +20356,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20343,11 +20369,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Oneway"
@@ -20367,15 +20392,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20392,11 +20415,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20417,8 +20440,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20436,11 +20459,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -20460,6 +20483,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20477,11 +20500,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Cutting"
@@ -20501,6 +20524,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20518,11 +20541,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Embankment"
@@ -20660,5 +20683,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Passing Places"
@@ -20667,12 +20690,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20680,13 +20706,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -20715,24 +20741,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Surface"
@@ -20744,5 +20766,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20756,11 +20778,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "paved"
@@ -20768,10 +20789,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "unpaved"
@@ -20779,10 +20800,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asphalt"
@@ -20790,11 +20811,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "concrete"
@@ -20802,10 +20822,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "metal"
@@ -20813,10 +20833,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "wood"
@@ -20824,10 +20844,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "paving_stones"
@@ -20835,11 +20855,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "cobblestone"
@@ -20847,10 +20866,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "gravel"
@@ -20858,10 +20877,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "pebblestone"
@@ -20869,10 +20888,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "compacted"
@@ -20880,10 +20899,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "grass_paver"
@@ -20891,10 +20910,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "grass"
@@ -20902,10 +20921,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sand"
@@ -20913,10 +20932,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "ground"
@@ -20997,6 +21016,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -21005,5 +21023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -21011,6 +21029,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Construction"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Edit Highway Under Construction"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Junction"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "roundabout"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
@@ -21019,15 +21066,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -21035,5 +21082,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Access"
@@ -21075,28 +21122,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "yes"
@@ -21109,10 +21155,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21126,10 +21172,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21153,97 +21199,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "agricultural"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "forestry"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "delivery"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Agricultural"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "designated"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "official"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -21258,10 +21304,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Horse"
@@ -21277,10 +21323,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -21295,19 +21341,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -21315,20 +21361,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
@@ -21336,5 +21382,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -21345,5 +21391,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -21363,10 +21409,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -21388,10 +21434,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -21413,10 +21459,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "primary_link"
@@ -21438,5 +21484,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21451,9 +21497,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "unclassified"
@@ -21467,9 +21513,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "living_street"
@@ -21499,10 +21545,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -21532,5 +21578,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21542,10 +21588,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -21553,39 +21599,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Construction"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Edit Highway Under Construction"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Junction"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "roundabout"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Track"
@@ -21594,73 +21611,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Edit Track"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Tracktype"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "MTB Scale"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "SAC Scale"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "mountain_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "demanding_mountain_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "alpine_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "demanding_alpine_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "difficult_alpine_hiking"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Path"
@@ -21669,38 +21654,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Edit Path"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "SAC Scale"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "hiking"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "mountain_hiking"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "demanding_mountain_hiking"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "alpine_hiking"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "demanding_alpine_hiking"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "difficult_alpine_hiking"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "good"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "bad"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -21709,5 +21724,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Dedicated Bridleway"
@@ -21715,5 +21730,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -21721,5 +21736,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Dedicated Cycleway"
@@ -21737,11 +21752,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Pedestrians"
@@ -21749,5 +21764,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Segregated Foot- and Cycleway"
@@ -21755,5 +21770,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Combined Foot- and Cycleway"
@@ -21761,5 +21776,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Dedicated Footway"
@@ -21768,15 +21783,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Edit Footway"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Bikes"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Steps"
@@ -21786,10 +21797,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -21797,15 +21808,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Services"
@@ -21813,5 +21824,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -21851,17 +21862,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operator"
@@ -21870,5 +21881,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -21878,5 +21889,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -21885,27 +21896,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -21913,6 +21924,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -21921,11 +21932,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -21933,30 +21944,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21964,5 +21975,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Pedestrian Crossing"
@@ -21971,14 +21982,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Edit Crossing"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Traffic Calming"
@@ -21986,33 +21997,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Edit Traffic Calming"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "bump"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "chicane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "choker"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "cushion"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "hump"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "table"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Passing Place"
@@ -22020,5 +22031,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Edit Passing Place"
@@ -22026,5 +22037,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -22035,14 +22046,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -22052,5 +22063,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "City Limit"
@@ -22058,15 +22069,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -22075,5 +22086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Emergency Phone"
@@ -22081,5 +22092,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Incline"
@@ -22087,5 +22098,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -22093,5 +22104,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Grit Bin"
@@ -22101,10 +22112,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -22112,5 +22123,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -22118,5 +22129,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -22128,7 +22139,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Elevation"
@@ -22136,5 +22147,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barriers"
@@ -22142,5 +22153,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Bollard"
@@ -22148,5 +22159,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -22191,16 +22202,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -22209,5 +22220,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Block"
@@ -22215,5 +22226,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -22221,10 +22232,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -22232,15 +22243,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -22248,5 +22259,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -22254,10 +22265,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -22267,5 +22278,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Hedge"
@@ -22276,22 +22287,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Fence"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "fence"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "wood_fence"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "wire_fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Wall"
@@ -22299,5 +22310,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "City Wall"
@@ -22306,5 +22317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -22316,10 +22327,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
@@ -22327,5 +22338,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Gate"
@@ -22333,50 +22344,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Stile"
@@ -22384,25 +22395,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Turnstile"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Edit Turnstile"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -22413,11 +22424,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Spring"
@@ -22425,5 +22436,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -22431,5 +22442,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Drain"
@@ -22437,10 +22448,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Ditch"
@@ -22448,10 +22459,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Edit Ditch"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Stream"
@@ -22459,10 +22470,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Canal"
@@ -22470,10 +22481,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "River"
@@ -22483,5 +22494,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Edit River"
@@ -22489,15 +22500,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -22505,15 +22516,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Basin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -22521,15 +22532,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -22537,5 +22548,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -22544,10 +22555,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Wetland"
@@ -22558,14 +22569,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "bog"
@@ -22579,35 +22590,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Mud"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Beach"
@@ -22615,20 +22626,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Bay"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Cliff"
@@ -22636,10 +22647,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Coastline"
@@ -22647,5 +22658,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -22653,5 +22664,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -22659,5 +22670,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -22666,5 +22677,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -22672,10 +22683,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dock"
@@ -22683,5 +22694,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -22689,5 +22700,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Dam"
@@ -22695,15 +22706,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -22712,5 +22723,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Weir"
@@ -22718,20 +22729,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -22740,15 +22751,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Pier"
@@ -22756,10 +22767,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -22767,10 +22778,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Slipway"
@@ -22780,20 +22791,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Railway"
@@ -22801,5 +22812,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -22829,86 +22840,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Gauge (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22920,8 +22856,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Types"
@@ -22935,29 +22871,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Electrified"
@@ -22970,8 +22906,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "contact_line"
@@ -23042,8 +22978,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23055,8 +22991,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltage"
@@ -23069,8 +23005,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Frequency (Hz)"
@@ -23083,23 +23019,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -23107,50 +23043,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Subway"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -23158,5 +23094,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -23165,10 +23101,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
@@ -23177,9 +23113,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Optional Types"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -23188,5 +23124,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -23195,5 +23131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Crossing"
@@ -23203,5 +23139,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -23209,5 +23145,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Turntable"
@@ -23216,5 +23152,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Buffer Stop"
@@ -23223,10 +23159,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -23234,10 +23170,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -23245,10 +23181,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -23256,10 +23192,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondola"
@@ -23267,10 +23203,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23279,5 +23215,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23285,5 +23221,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23292,5 +23228,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23298,5 +23234,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Fuel"
@@ -23306,62 +23242,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Indipend."
@@ -23419,32 +23355,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -23503,165 +23439,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel for Heavy Good Vehicles"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -23678,5 +23614,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23686,5 +23622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -23695,25 +23631,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -23722,48 +23658,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "See the Wiki for other capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -23771,5 +23707,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Rental"
@@ -23778,10 +23714,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Sharing"
@@ -23789,5 +23725,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -23795,10 +23731,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacity"
@@ -23807,10 +23743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23820,5 +23756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23826,5 +23762,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -23832,5 +23768,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -23838,5 +23774,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -23844,5 +23780,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -23851,5 +23787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -23857,5 +23793,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -23864,5 +23800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -23874,5 +23810,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -23880,10 +23816,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -23892,10 +23828,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -23904,5 +23840,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -23911,5 +23847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -23917,5 +23853,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -23925,5 +23861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -23932,6 +23868,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Shelter"
@@ -23939,19 +23875,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -23959,5 +23895,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23965,5 +23901,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -23971,10 +23907,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Airport"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Airport Ground"
@@ -23982,5 +23918,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Edit Airport Ground"
@@ -23988,10 +23924,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -24000,5 +23936,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Runway"
@@ -24006,5 +23942,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Edit Runway"
@@ -24012,5 +23948,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Taxiway"
@@ -24018,5 +23954,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Edit Taxiway"
@@ -24024,5 +23960,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Helipad"
@@ -24030,5 +23966,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Edit Helipad"
@@ -24038,5 +23974,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Apron"
@@ -24046,5 +23982,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -24055,6 +23991,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Beacon"
@@ -24064,5 +24000,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Windsock"
@@ -24071,5 +24007,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Terminal"
@@ -24077,5 +24013,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Edit Terminal"
@@ -24083,15 +24019,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Edit Terminal Gate"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -24103,5 +24039,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24110,15 +24046,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24126,20 +24062,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chalet"
@@ -24147,10 +24083,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostel"
@@ -24158,30 +24094,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -24189,10 +24125,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -24203,5 +24139,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24209,5 +24145,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -24215,5 +24151,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -24221,73 +24157,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24295,17 +24231,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Cafe"
@@ -24313,9 +24249,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -24323,18 +24259,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24342,9 +24278,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -24352,24 +24288,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -24377,9 +24313,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24388,9 +24324,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -24398,24 +24334,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Artwork"
@@ -24423,5 +24359,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -24429,19 +24365,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topo"
@@ -24479,5 +24415,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24485,28 +24421,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -24516,5 +24452,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -24522,5 +24458,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Hiking"
@@ -24528,6 +24464,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cycling"
@@ -24535,5 +24471,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -24541,6 +24477,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skiing"
@@ -24548,5 +24484,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Riding"
@@ -24554,46 +24490,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -24601,29 +24537,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -24631,25 +24567,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Castle"
@@ -24658,19 +24594,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -24679,9 +24615,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -24689,10 +24625,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -24700,5 +24636,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -24706,15 +24642,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memorial"
@@ -24722,55 +24658,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Playground"
@@ -24778,35 +24714,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -24820,6 +24756,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "select sport:"
@@ -25211,6 +25147,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25244,225 +25180,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -25501,21 +25437,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "type"
@@ -25554,203 +25490,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -25758,52 +25694,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Shooting"
@@ -25811,177 +25747,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Building"
@@ -25989,5 +25925,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Public Building"
@@ -25995,10 +25931,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Town hall"
@@ -26006,10 +25942,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embassy"
@@ -26017,10 +25953,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -26029,10 +25965,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prison"
@@ -26041,10 +25977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Police"
@@ -26054,10 +25990,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -26066,10 +26002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Post Office"
@@ -26077,5 +26013,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -26083,15 +26019,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "School"
@@ -26099,10 +26035,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "University"
@@ -26110,10 +26046,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "College"
@@ -26121,5 +26057,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Edit College"
@@ -26127,5 +26063,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -26134,10 +26070,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Library"
@@ -26146,9 +26082,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -26156,10 +26092,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theatre"
@@ -26168,10 +26104,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -26181,5 +26117,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -26188,6 +26124,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -26196,66 +26132,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Denomination"
@@ -26264,81 +26200,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Addresses"
@@ -26347,5 +26283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -26353,5 +26289,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "House number"
@@ -26359,25 +26295,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Country code"
@@ -26386,5 +26322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -26392,61 +26328,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -26454,25 +26390,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -26480,10 +26416,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmill"
@@ -26491,10 +26427,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -26503,41 +26439,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -26547,10 +26483,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Crane"
@@ -26558,5 +26494,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -26564,10 +26500,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -26575,10 +26511,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -26586,23 +26522,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -26612,35 +26548,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Power Station"
@@ -26649,10 +26585,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -26661,5 +26597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -26667,10 +26603,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -26681,23 +26617,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Power Line"
@@ -26706,74 +26642,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "line"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "minor_line"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Number of wires (better: conductors) per power cable"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telephone"
@@ -26782,5 +26718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -26788,5 +26724,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Coins"
@@ -26794,5 +26730,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Notes"
@@ -26800,5 +26736,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -26806,5 +26742,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -26812,15 +26748,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recycling"
@@ -26829,5 +26765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -26835,35 +26771,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -26871,5 +26807,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -26878,31 +26814,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "brown"
@@ -26981,5 +26917,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26989,31 +26925,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -27022,30 +26958,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fountain"
@@ -27054,10 +26990,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -27066,10 +27002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -27078,5 +27014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -27084,5 +27020,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -27090,15 +27026,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -27106,10 +27042,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -27118,28 +27054,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -27147,9 +27083,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27157,27 +27093,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Butcher"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Edit Butcher"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Edit Baker"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Edit Florist"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Organic"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Edit Organic Shop"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alcohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Edit Alcohol Shop"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Beverages"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Edit Beverages Shop"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Electronics"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Edit Electronics Shop"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Edit Hifi Shop"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Furniture"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Edit Furniture Shop"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Garden Centre"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Edit Garden Centre"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Hardware"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Edit Hardware Store"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Do-it-yourself-store"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Edit Do-it-yourself-store"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Stationery"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Edit Stationery Shop"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Hairdresser"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Edit Hairdresser"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Shoes"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Edit Shoe Shop"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Toys"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Edit Toy Shop"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Edit Video Shop"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Dry Cleaning"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Edit Dry Cleaning"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Laundry"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Edit Laundry"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Edit Outdoor Shop"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Edit Sports Shop"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optician"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Edit Optician"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -27185,5 +27335,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -27191,306 +27341,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicycle"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Butcher"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Edit Butcher"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Edit Baker"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Edit Florist"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Organic"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Edit Organic Shop"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alcohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Edit Alcohol Shop"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Beverages"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Edit Beverages Shop"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Edit Computer Shop"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Electronics"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Edit Electronics Shop"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Edit Hifi Shop"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Furniture"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Edit Furniture Shop"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Garden Centre"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Edit Garden Centre"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Hardware"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Edit Hardware Store"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Do-it-yourself-store"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Edit Do-it-yourself-store"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Stationery"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Edit Stationery Shop"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Hairdresser"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Edit Hairdresser"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Shoes"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Edit Shoe Shop"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Toys"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Edit Toy Shop"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Edit Video Shop"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Dry Cleaning"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Edit Dry Cleaning"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Laundry"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Edit Laundry"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Edit Outdoor Shop"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Edit Sports Shop"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optician"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Edit Optician"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -27498,14 +27440,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -27513,5 +27455,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -27519,15 +27461,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Doctors"
@@ -27535,18 +27477,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -27554,5 +27496,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -27560,9 +27502,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hospital"
@@ -27570,10 +27512,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -27582,5 +27524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -27589,20 +27531,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -27610,5 +27552,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -27617,64 +27559,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Edit County"
@@ -27682,15 +27624,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Town"
@@ -27698,10 +27640,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Suburb"
@@ -27709,25 +27651,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -27735,5 +27677,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Locality"
@@ -27741,10 +27683,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Island"
@@ -27752,10 +27694,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Islet"
@@ -27763,5 +27705,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -27769,5 +27711,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -27775,10 +27717,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Peak"
@@ -27786,10 +27728,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Glacier"
@@ -27797,10 +27739,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Volcano"
@@ -27808,70 +27750,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Tree"
@@ -27880,15 +27822,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Wood"
@@ -27897,5 +27839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -27903,17 +27845,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Forest"
@@ -27922,14 +27864,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -27937,25 +27879,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Fell"
@@ -27963,10 +27905,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Heath"
@@ -27974,5 +27916,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -27980,5 +27922,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -27987,45 +27929,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -28033,25 +27975,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Village Green"
@@ -28059,10 +28001,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Common"
@@ -28070,20 +28012,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -28091,5 +28033,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -28097,15 +28039,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -28113,9 +28055,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -28123,39 +28065,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Railway land"
@@ -28163,15 +28105,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -28179,50 +28121,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -28232,5 +28174,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -28239,10 +28181,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "inner segment"
@@ -28250,5 +28192,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -28257,5 +28199,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -28263,34 +28205,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -28299,15 +28241,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "to way"
@@ -28315,5 +28257,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Route"
@@ -28322,5 +28264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -28328,5 +28270,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Route type"
@@ -28417,5 +28359,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28425,17 +28367,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -28495,5 +28437,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28502,9 +28444,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "detour"
@@ -28518,10 +28460,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -28529,31 +28471,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -28562,32 +28504,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "backward halt point"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -32611,4 +32628,7 @@
 msgstr "Sicily - Italy"
 
+#~ msgid "Bikes"
+#~ msgstr "Bikes"
+
 #~ msgid "Gauss-Laborde Réunion 1947"
 #~ msgstr "Gauss-Laborde Réunion 1947"
Index: /applications/editors/josm/i18n/po/en_GB.po
===================================================================
--- /applications/editors/josm/i18n/po/en_GB.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/en_GB.po	(revision 20945)
@@ -11,5 +11,5 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
 "PO-Revision-Date: 2010-04-06 19:42+0000\n"
 "Last-Translator: Andrew Aylett <andrew@aylett.co.uk>\n"
@@ -19,5 +19,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1204,5 +1204,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Cannot move objects outside of the world."
@@ -1533,5 +1533,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2307,9 +2307,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2392,26 +2392,26 @@
 msgstr "Finish drawing."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extrude"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Create areas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extrude Way"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Move a segment along its normal, then release the mouse button."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Draw a rectangle of the desired size, then release the mouse button."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2433,6 +2433,6 @@
 "+release to synchronise audio at that point."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2444,9 +2444,9 @@
 msgstr "Select"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Select, move and rotate objects"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2455,17 +2455,17 @@
 msgstr[1] "Add and move a virtual new node to {0} ways"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Move elements"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Move them"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Undo move"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2478,19 +2478,19 @@
 "Really move them?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Release the mouse button to select the objects in the rectangle."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Release the mouse button to stop rotating."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3247,5 +3247,5 @@
 msgstr "Apply?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3854,17 +3854,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "connection"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Not yet tagged images"
+msgstr ""
 
 #. teal
@@ -4048,5 +4045,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "railway"
@@ -5386,5 +5383,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "all"
@@ -5823,4 +5820,9 @@
 msgstr "Filter mode"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5911,5 +5913,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relations"
@@ -6011,9 +6013,9 @@
 msgstr "Selection: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Undock the panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6021,5 +6023,5 @@
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Click to minimise/maximise the panel content"
@@ -6359,4 +6361,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6369,10 +6377,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7042,145 +7044,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Name"
@@ -8472,10 +8474,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Type"
@@ -8483,5 +8485,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8495,17 +8496,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "unknown"
@@ -9348,11 +9348,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9369,14 +9371,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Layer"
@@ -9952,5 +9954,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Description"
@@ -11092,26 +11094,26 @@
 msgstr "Close the dialogue and accept the Access Token"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Warning: failed to cancel running OAuth operation"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Retrieving OAuth Request Token from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Retrieving OAuth Access Token from ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "OSM website did not return a session cookie in response to ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11119,29 +11121,29 @@
 "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Failed to authorise OAuth request  ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Authorising OAuth Request token ''{0}'' at the OSM website ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Initialising a session at the OSM website..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Authenticating the session for user ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Authorising request token ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11663,5 +11665,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Car"
@@ -11683,16 +11685,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicycle"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11722,12 +11725,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Foot"
@@ -12464,17 +12467,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Advanced OAuth parameters"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Street name"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Measured values"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14960,6 +14960,7 @@
 msgstr "Upload Traces"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibility"
@@ -15050,5 +15051,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Address Interpolation"
@@ -15235,5 +15236,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Create building"
@@ -15274,19 +15275,19 @@
 msgstr "Set width of building"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr "Grab buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Extract building on click (vector images only)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Buildings"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15296,5 +15297,5 @@
 "Buildings layer and an OSM data layer."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15310,10 +15311,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Select Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15357,7 +15358,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert Zone 2 cache file (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15508,5 +15508,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17387,5 +17387,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Public Transport"
@@ -17437,5 +17437,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Waypoints"
@@ -18012,4 +18012,22 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Type"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "From ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
 msgstr ""
 
@@ -18181,4 +18199,18 @@
 msgstr "Already participating in a conflict"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Delete from turn restriction"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Delete from turn restriction"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -18944,5 +18976,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -20299,7 +20331,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Reference"
@@ -20316,5 +20348,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Lanes"
@@ -20332,4 +20364,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20337,9 +20370,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. speed (km/h)"
@@ -20367,15 +20399,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20386,11 +20412,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Oneway"
@@ -20410,15 +20435,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20435,11 +20458,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20460,8 +20483,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20479,11 +20502,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -20503,6 +20526,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20520,11 +20543,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Cutting"
@@ -20544,6 +20567,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20561,11 +20584,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Embankment"
@@ -20703,5 +20726,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Passing Places"
@@ -20710,12 +20733,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20723,13 +20749,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Width (metres)"
@@ -20758,24 +20784,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Surface"
@@ -20787,5 +20809,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20799,11 +20821,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "paved"
@@ -20811,10 +20832,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "unpaved"
@@ -20822,10 +20843,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asphalt"
@@ -20833,11 +20854,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "concrete"
@@ -20845,10 +20865,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "metal"
@@ -20856,10 +20876,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "wood"
@@ -20867,10 +20887,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "paving_stones"
@@ -20878,11 +20898,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "cobblestone"
@@ -20890,10 +20909,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "gravel"
@@ -20901,10 +20920,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "pebblestone"
@@ -20912,10 +20931,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "compacted"
@@ -20923,10 +20942,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "grass_paver"
@@ -20934,10 +20953,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "grass"
@@ -20945,10 +20964,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sand"
@@ -20956,10 +20975,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "ground"
@@ -21040,6 +21059,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Road (Unknown Type)"
@@ -21048,5 +21066,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Edit Road of unknown type"
@@ -21054,6 +21072,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Construction"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Edit Highway Under Construction"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Junction"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "roundabout"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Road Restrictions"
@@ -21062,15 +21109,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Edit Road Restrictions"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Toll"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "No exit (cul-de-sac)"
@@ -21078,5 +21125,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Access"
@@ -21118,28 +21165,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "yes"
@@ -21152,10 +21198,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21169,10 +21215,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21196,97 +21242,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "agricultural"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "forestry"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "delivery"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Agricultural"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "designated"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "official"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Goods"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Heavy Goods Vehicles (hgv)"
@@ -21301,10 +21347,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Horse"
@@ -21320,10 +21366,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorcycle"
@@ -21338,19 +21384,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorcar"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Public Service Vehicles (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. speed (km/h)"
@@ -21358,20 +21404,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. weight (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. Height (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. Width (metres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. Length (metres)"
@@ -21379,5 +21425,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Roundabout"
@@ -21388,5 +21434,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Edit Junction"
@@ -21406,10 +21452,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -21431,10 +21477,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -21456,10 +21502,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primary"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "primary_link"
@@ -21481,5 +21527,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21494,9 +21540,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiary"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "unclassified"
@@ -21510,9 +21556,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "residential"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "living_street"
@@ -21542,10 +21588,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "service"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "bus_guideway"
@@ -21575,5 +21621,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21585,10 +21631,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Edit Bridge"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Edit Tunnel"
@@ -21596,39 +21642,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Ways"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Construction"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Edit Highway Under Construction"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Junction"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "roundabout"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Track"
@@ -21637,73 +21654,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Edit Track"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Tracktype"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "MTB Scale"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "SAC Scale"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "mountain_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "demanding_mountain_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "alpine_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "demanding_alpine_hiking"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "difficult_alpine_hiking"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Path"
@@ -21712,38 +21697,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Edit Path"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "SAC Scale"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "hiking"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "mountain_hiking"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "demanding_mountain_hiking"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "alpine_hiking"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "demanding_alpine_hiking"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "difficult_alpine_hiking"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "good"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermediate"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "bad"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Wheelchairs"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snowmobile"
@@ -21752,5 +21767,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Dedicated Bridleway"
@@ -21758,5 +21773,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Edit Bridleway"
@@ -21764,5 +21779,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Dedicated Cycleway"
@@ -21780,11 +21795,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Edit Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Pedestrians"
@@ -21792,5 +21807,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Segregated Foot- and Cycleway"
@@ -21798,5 +21813,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Combined Foot- and Cycleway"
@@ -21804,5 +21819,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Dedicated Footway"
@@ -21811,15 +21826,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Edit Footway"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Bikes"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Steps"
@@ -21829,10 +21840,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Edit Flight of Steps"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Motorway Junction"
@@ -21840,15 +21851,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Edit Motorway Junction"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Number"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Services"
@@ -21856,5 +21867,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Edit Service Station"
@@ -21894,17 +21905,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operator"
@@ -21913,5 +21924,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Traffic Lights"
@@ -21921,5 +21932,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Pedestrian crossing type"
@@ -21928,27 +21939,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "uncontrolled"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "traffic_signals"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "island"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "unmarked"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Cross on horseback"
@@ -21956,6 +21967,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Cross by bicycle"
@@ -21964,11 +21975,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Crossing attendant"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -21976,30 +21987,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -22007,5 +22018,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Pedestrian Crossing"
@@ -22014,14 +22025,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Edit Crossing"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Traffic Calming"
@@ -22029,33 +22040,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Edit Traffic Calming"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "bump"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "chicane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "choker"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "cushion"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "hump"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "table"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Passing Place"
@@ -22063,5 +22074,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Edit Passing Place"
@@ -22069,5 +22080,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-roundabout"
@@ -22078,14 +22089,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Direction"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "clockwise"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Turning Circle"
@@ -22095,5 +22106,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "City Limit"
@@ -22101,15 +22112,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Edit City Limit Sign"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Second Name"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -22118,5 +22129,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Emergency Phone"
@@ -22124,5 +22135,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Incline"
@@ -22130,5 +22141,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Incline Steep"
@@ -22136,5 +22147,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Grit Bin"
@@ -22144,10 +22155,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Ford"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Edit Ford"
@@ -22155,5 +22166,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Mountain Pass"
@@ -22161,5 +22172,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Edit Mountain Pass"
@@ -22171,7 +22182,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Elevation"
@@ -22179,5 +22190,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barriers"
@@ -22185,5 +22196,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Bollard"
@@ -22191,5 +22202,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Edit Bollard"
@@ -22234,16 +22245,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Allowed traffic:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Cycle Barrier"
@@ -22252,5 +22263,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Block"
@@ -22258,5 +22269,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Cattle Grid"
@@ -22264,10 +22275,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Edit Cattle Grid"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bus Trap"
@@ -22275,15 +22286,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Edit Spikes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Toll Booth"
@@ -22291,5 +22302,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Edit Toll Booth"
@@ -22297,10 +22308,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Border Control point"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Edit Border Control point"
@@ -22310,5 +22321,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Hedge"
@@ -22319,22 +22330,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Fence"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "fence"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "wood_fence"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "wire_fence"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Wall"
@@ -22342,5 +22353,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "City Wall"
@@ -22349,5 +22360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Retaining Wall"
@@ -22359,10 +22370,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Entrance"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Edit an Entrance"
@@ -22370,5 +22381,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Gate"
@@ -22376,50 +22387,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Edit Gate"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Lift Gate"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Edit Lift Gate"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Edit Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Edit Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Edit Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Stile"
@@ -22427,25 +22438,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Edit Stile"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Turnstile"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Edit Turnstile"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Sally Port"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Edit Sally Port"
@@ -22456,11 +22467,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Spring"
@@ -22468,5 +22479,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Edit Spring"
@@ -22474,5 +22485,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Drain"
@@ -22480,10 +22491,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Edit Drain"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Ditch"
@@ -22491,10 +22502,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Edit Ditch"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Stream"
@@ -22502,10 +22513,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Edit Stream"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Canal"
@@ -22513,10 +22524,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Edit Canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "River"
@@ -22526,5 +22537,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Edit River"
@@ -22532,15 +22543,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Edit Water"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Edit Land"
@@ -22548,15 +22559,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Basin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Edit Basin Landuse"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -22564,15 +22575,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Edit Reservoir Landuse"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Covered Reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Edit Covered Reservoir"
@@ -22580,5 +22591,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Riverbank"
@@ -22587,10 +22598,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Edit Riverbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Wetland"
@@ -22601,14 +22612,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Edit Wetland"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "swamp"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "bog"
@@ -22622,35 +22633,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsh"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "reedbed"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "saltmarsh"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "tidalflat"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Mud"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Edit Mud"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Beach"
@@ -22658,20 +22669,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Edit Beach"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Bay"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Edit Bay"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Cliff"
@@ -22679,10 +22690,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Edit Cliff"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Coastline"
@@ -22690,5 +22701,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Edit Coastline"
@@ -22696,5 +22707,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Ferry Route"
@@ -22702,5 +22713,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Edit Ferry"
@@ -22709,5 +22720,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Boatyard"
@@ -22715,10 +22726,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Edit Boatyard"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dock"
@@ -22726,5 +22737,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Edit Dock"
@@ -22732,5 +22743,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Dam"
@@ -22738,15 +22749,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Edit Dam"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Waterway Point"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -22755,5 +22766,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Weir"
@@ -22761,20 +22772,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Edit Weir"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Waterfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Edit Waterfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Turning Point"
@@ -22783,15 +22794,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Edit Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Pier"
@@ -22799,10 +22810,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Edit Pier"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Ferry Terminal"
@@ -22810,10 +22821,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Edit Ferry Terminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Slipway"
@@ -22823,20 +22834,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Edit Slipway"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Railway"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Railway"
@@ -22844,5 +22855,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Edit Railway"
@@ -22872,86 +22883,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Gauge (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22963,8 +22899,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Types"
@@ -22978,29 +22914,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "yard"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "siding"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "spur"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Electrified"
@@ -23013,8 +22949,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "contact_line"
@@ -23085,8 +23021,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23098,8 +23034,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltage"
@@ -23112,8 +23048,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Frequency (Hz)"
@@ -23126,23 +23062,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Narrow Gauge Railway"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edit Narrow Gauge Railway"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -23150,50 +23086,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Edit Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Preserved"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Edit Preserved Railway"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Light Rail"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Edit Light Rail"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Subway"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Edit Subway"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Edit Tram"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Bus Guideway"
@@ -23201,5 +23137,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Edit Bus Guideway"
@@ -23208,10 +23144,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Disused Rail"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Edit Disused Railway"
@@ -23220,9 +23156,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Optional Types"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Abandoned Rail"
@@ -23231,5 +23167,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Level Crossing"
@@ -23238,5 +23174,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Crossing"
@@ -23246,5 +23182,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Crossing type"
@@ -23252,5 +23188,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Turntable"
@@ -23259,5 +23195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Buffer Stop"
@@ -23266,10 +23202,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Aerialway"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Chair Lift"
@@ -23277,10 +23213,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Edit Chair Lift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Drag Lift"
@@ -23288,10 +23224,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Edit Drag Lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Cable Car"
@@ -23299,10 +23235,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Edit Cable Car"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondola"
@@ -23310,10 +23246,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Edit Gondola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23322,5 +23258,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23328,5 +23264,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23335,5 +23271,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23341,5 +23277,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Fuel"
@@ -23349,62 +23285,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Edit Fuel"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Indipend."
@@ -23462,32 +23398,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Opening Hours"
@@ -23546,165 +23482,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Fuel types:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel for Heavy Good Vehicles"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "Octane 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "Octane 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "Octane 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "Octane 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% Ethanol mix)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% Ethanol mix)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "LPG (Liquefied petroleum gas)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "CNG (Compressed Natural Gas)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "1/25 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "1/50 mix (mofa/moped)"
@@ -23721,5 +23657,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23729,5 +23665,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Edit Parking"
@@ -23738,25 +23674,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Reference number"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "multi-storey"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underground"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Park and Ride"
@@ -23765,48 +23701,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Fee"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Capacity (overall)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Spaces for Disabled"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Spaces for Women"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Spaces for Parents"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "See the Wiki for other capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Wash"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Edit Car Wash"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Repair"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Edit Car Repair"
@@ -23814,5 +23750,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Rental"
@@ -23821,10 +23757,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Edit Car Rental"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Sharing"
@@ -23832,5 +23768,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Edit Car Sharing"
@@ -23838,10 +23774,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Edit Bicycle Parking"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacity"
@@ -23850,10 +23786,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Edit Bicycle Rental"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23863,5 +23799,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23869,5 +23805,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -23875,5 +23811,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Railway Halt"
@@ -23881,5 +23817,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Edit Halt"
@@ -23887,5 +23823,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Tram Stop"
@@ -23894,5 +23830,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Edit Tram Stop"
@@ -23900,5 +23836,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Railway Platform"
@@ -23907,5 +23843,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Edit Railway Platform"
@@ -23917,5 +23853,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Reference (track number)"
@@ -23923,10 +23859,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Subway Entrance"
@@ -23935,10 +23871,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Edit Subway Entrance"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Wheelchair"
@@ -23947,5 +23883,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Bus Station"
@@ -23954,5 +23890,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Edit Bus Station"
@@ -23960,5 +23896,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Bus Stop"
@@ -23968,5 +23904,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Edit Bus Stop"
@@ -23975,6 +23911,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Shelter"
@@ -23982,19 +23918,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bench"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Tactile Paving"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Bus Platform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Edit Bus Platform"
@@ -24002,5 +23938,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -24008,5 +23944,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Edit Taxi station"
@@ -24014,10 +23950,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Airport"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Airport Ground"
@@ -24025,5 +23961,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Edit Airport Ground"
@@ -24031,10 +23967,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -24043,5 +23979,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Runway"
@@ -24049,5 +23985,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Edit Runway"
@@ -24055,5 +23991,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Taxiway"
@@ -24061,5 +23997,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Edit Taxiway"
@@ -24067,5 +24003,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Helipad"
@@ -24073,5 +24009,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Edit Helipad"
@@ -24081,5 +24017,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Apron"
@@ -24089,5 +24025,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -24098,6 +24034,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Beacon"
@@ -24107,5 +24043,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Windsock"
@@ -24114,5 +24050,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Terminal"
@@ -24120,5 +24056,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Edit Terminal"
@@ -24126,15 +24062,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Edit Terminal Gate"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Travel"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Accomodation"
@@ -24146,5 +24082,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24153,15 +24089,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Edit Hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24169,20 +24105,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Edit Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Edit Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chalet"
@@ -24190,10 +24126,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Edit Chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostel"
@@ -24201,30 +24137,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Edit Hostel"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Edit Alpine Hut"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Edit Caravan Site"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Camp Site"
@@ -24232,10 +24168,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Edit Camp Site"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Food+Drinks"
@@ -24246,5 +24182,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24252,5 +24188,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Edit Restaurant"
@@ -24258,5 +24194,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -24264,73 +24200,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chinese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "greek"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "german"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turkish"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asian"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "french"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -24338,17 +24274,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Edit Fast Food Restaurant"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "fish_and_chips"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "chicken"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Cafe"
@@ -24356,9 +24292,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Edit Cafe"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -24366,18 +24302,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Edit Pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Edit Biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24385,9 +24321,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Edit Bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nightclub"
@@ -24395,24 +24331,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Edit Nightclub"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Tourism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Edit Attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -24420,9 +24356,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Edit Museum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24431,9 +24367,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Edit Zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Viewpoint"
@@ -24441,24 +24377,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Edit Viewpoint"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Theme Park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Artwork"
@@ -24466,5 +24402,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Edit Artwork"
@@ -24472,19 +24408,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Information Office"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Map"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Detail Grade"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topo"
@@ -24522,5 +24458,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24528,28 +24464,28 @@
 msgstr "street"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "scheme"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Shown Area"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "site"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "city"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "region"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Closer Description"
@@ -24559,5 +24495,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Routes shown for:"
@@ -24565,5 +24501,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Hiking"
@@ -24571,6 +24507,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cycling"
@@ -24578,5 +24514,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountainbiking"
@@ -24584,6 +24520,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skiing"
@@ -24591,5 +24527,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Riding"
@@ -24597,46 +24533,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... other transportation modes possible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Information Board"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Board Content"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "notice"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "history"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "wildlife"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "plants"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Guidepost"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Information Terminal"
@@ -24644,29 +24580,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Closer description"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audioguide"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audioguide via mobile phone?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Phone number"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Other Information Points"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Edit Shelter"
@@ -24674,25 +24610,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Fireplace"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picnic Site"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Edit Picnic Site"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historic Places"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Castle"
@@ -24701,19 +24637,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Edit Castle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruins"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Edit Ruins"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Archaeological Site"
@@ -24722,9 +24658,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Edit Archaeological Site"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Battlefield"
@@ -24732,10 +24668,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Edit Battlefield"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Palaeontological Site"
@@ -24743,5 +24679,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Edit Palaeontological Site"
@@ -24749,15 +24685,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Edit Monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memorial"
@@ -24765,55 +24701,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Edit Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Wayside Cross"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Edit Wayside Cross"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Edit Wayside Shrine"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Boundary Stone"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Edit Boundary Stone"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Leisure"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Water Park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Edit Water Park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Playground"
@@ -24821,35 +24757,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Edit Playground"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fishing"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Edit Fishing"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport Facilities"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadium"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Edit Stadium"
@@ -24863,6 +24799,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "select sport:"
@@ -25254,6 +25190,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25287,225 +25223,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "archery"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "athletics"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "lawn bowls"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoeing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "climbing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cycling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "dog racing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "equestrian"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastics"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "horse_racing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "shooting"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skating"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skiing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "soccer"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "swimming"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "table_tennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sports Centre"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Edit Sports Centre"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Pitch"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Edit Pitch"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Racetrack"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Edit Racetrack"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf Course"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Edit Golf Course"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Miniature Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Edit Miniature Golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Edit Multi"
@@ -25544,21 +25480,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "type"
@@ -25597,203 +25533,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "pitch"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sports_centre"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "track"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Edit 10pin"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Athletics"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Edit Athletics"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Archery"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Edit Archery"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Climbing"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Edit Climbing"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoeing"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Edit Canoeing"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Edit Cycling"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Dog Racing"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Edit Dog Racing"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equestrian"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Edit Equestrian"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Horse Racing"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Edit Horse Racing"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastics"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Edit Gymnastics"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motor Sports"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Edit Motor Sports"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skating"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Edit Skating"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Edit Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Swimming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Edit Swimming"
@@ -25801,52 +25737,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Edit Skiing"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Piste type"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "downhill"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nordic"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficulty"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novice"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "easy"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "advanced"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Shooting"
@@ -25854,177 +25790,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Edit Shooting"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (Ball)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Edit Football"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "American Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Edit American Football"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Edit Australian Football"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Edit Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Edit Basketball"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Edit Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Edit Boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Edit Bowls"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit Cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Edit Cricket Nets"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Edit Croquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Edit Hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Edit Pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Edit Racquet"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Edit Rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Table Tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Edit Table Tennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Edit Tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Man-Made"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Building"
@@ -26032,5 +25968,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Public Building"
@@ -26038,10 +25974,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Edit Public Building"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Town hall"
@@ -26049,10 +25985,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Edit Town hall"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embassy"
@@ -26060,10 +25996,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Edit Embassy"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Courthouse"
@@ -26072,10 +26008,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Edit Courthouse"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prison"
@@ -26084,10 +26020,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Edit Prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Police"
@@ -26097,10 +26033,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Edit Police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Fire Station"
@@ -26109,10 +26045,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Edit Fire Station"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Post Office"
@@ -26120,5 +26056,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Edit Post Office"
@@ -26126,15 +26062,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Edit Preschool"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "School"
@@ -26142,10 +26078,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Edit School"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "University"
@@ -26153,10 +26089,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Edit University"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "College"
@@ -26164,5 +26100,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Edit College"
@@ -26170,5 +26106,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -26177,10 +26113,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Edit Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Library"
@@ -26189,9 +26125,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Edit Library"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Arts Centre"
@@ -26199,10 +26135,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Edit Arts Centre"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theatre"
@@ -26211,10 +26147,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Edit Theatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Place of Worship"
@@ -26224,5 +26160,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Edit Place of Worship"
@@ -26231,6 +26167,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -26239,66 +26175,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "christian"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "jewish"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarian"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Denomination"
@@ -26307,81 +26243,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglican"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "catholic"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelical"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "jehovahs_witness"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Addresses"
@@ -26390,5 +26326,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Edit Address Information"
@@ -26396,5 +26332,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "House number"
@@ -26402,25 +26338,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "House name"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Street name"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "City name"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Post code"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Country code"
@@ -26429,5 +26365,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Edit Address Interpolation"
@@ -26435,61 +26371,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numbering scheme"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "odd"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabetic"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Man Made"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Works"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Edit Works"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tower"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Edit Tower"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tower type"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Height (metres)"
@@ -26497,25 +26433,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Water Tower"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Edit Water Tower"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometer"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Edit Gasometer"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Lighthouse"
@@ -26523,10 +26459,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Edit Lighthouse"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmill"
@@ -26534,10 +26470,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Edit Windmill"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pipeline"
@@ -26546,41 +26482,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Edit Pipeline"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "heat"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "oil"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "sewage"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "any substance"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Location"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "underwater"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "overground"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Sewerage Plant"
@@ -26590,10 +26526,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Edit Sewerage Plant"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Crane"
@@ -26601,5 +26537,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Edit Crane"
@@ -26607,10 +26543,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Edit Beacon"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Survey Point"
@@ -26618,10 +26554,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Edit Survey Point"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -26629,23 +26565,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Edit Surveillance Camera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "indoor"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "outdoor"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Power Generator"
@@ -26655,35 +26591,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Edit Power Generator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hydro"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "coal"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "photovoltaic"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Power Station"
@@ -26692,10 +26628,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Edit Power Station"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Power Sub Station"
@@ -26704,5 +26640,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Edit Power Sub Station"
@@ -26710,10 +26646,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Line reference"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Power Tower"
@@ -26724,23 +26660,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Edit Power Tower"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "tower"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "pole"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Tower reference"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Power Line"
@@ -26749,74 +26685,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Edit Power Line"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Line type"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "line"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "minor_line"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Amount of Cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Number of wires (better: conductors) per power cable"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "single"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Amenities"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toilets"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limited"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Note"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Post Box"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telephone"
@@ -26825,5 +26761,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Edit Telephone"
@@ -26831,5 +26767,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Coins"
@@ -26837,5 +26773,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Notes"
@@ -26843,5 +26779,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Electronic purses and Charge cards"
@@ -26849,5 +26785,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debit cards"
@@ -26855,15 +26791,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Credit cards"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telephone cards"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recycling"
@@ -26872,5 +26808,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Edit Recycling station"
@@ -26878,35 +26814,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Cans"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Clothes"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Paper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Scrap Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Waste Basket"
@@ -26914,5 +26850,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Edit Waste Basket"
@@ -26921,31 +26857,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "stone"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastic"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Colour"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "black"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "brown"
@@ -27024,5 +26960,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27032,31 +26968,31 @@
 msgstr "green"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "blue"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "gray"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "white"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Amount of Seats"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Edit Hunting Stand"
@@ -27065,30 +27001,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Height"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "low"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "half"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Hide"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lock"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fountain"
@@ -27097,10 +27033,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Edit Fountain"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Drinking Water"
@@ -27109,10 +27045,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Edit Drinking Water"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Fire Hydrant"
@@ -27121,5 +27057,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Edit Fire Hydrant"
@@ -27127,5 +27063,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Baby Hatch"
@@ -27133,15 +27069,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Edit Baby Hatch"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Shops"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Car Dealer"
@@ -27149,10 +27085,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Edit Car Shop"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Bike Dealer"
@@ -27161,28 +27097,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Edit Bicycle Shop"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Edit Supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Chemist"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Edit Chemist"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Convenience Store"
@@ -27190,9 +27126,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Edit Convenience Store"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -27200,27 +27136,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Edit Kiosk"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Book Store"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Edit Book Store"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Travel Agency"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Edit Travel Agency"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Butcher"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Edit Butcher"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Edit Baker"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Edit Florist"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Organic"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Edit Organic Shop"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alcohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Edit Alcohol Shop"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Beverages"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Edit Beverages Shop"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Edit Computer Shop"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Electronics"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Edit Electronics Shop"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Edit Hifi Shop"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Furniture"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Edit Furniture Shop"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Garden Centre"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Edit Garden Centre"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Hardware"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Edit Hardware Store"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Do-it-yourself-store"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Edit Do-it-yourself-store"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Stationery"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Edit Stationery Shop"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Hairdresser"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Edit Hairdresser"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Shoes"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Edit Shoe Shop"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Toys"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Edit Toy Shop"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Edit Video Shop"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Dry Cleaning"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Edit Dry Cleaning"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Laundry"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Edit Laundry"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Edit Outdoor Shop"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Edit Sports Shop"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optician"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Edit Optician"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Vending machine"
@@ -27228,5 +27378,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Edit Vending machine"
@@ -27234,306 +27384,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Vending products"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "public_transport_tickets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "public_transport_plans"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parking_tickets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "food"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "drinks"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "sweets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "animal_food"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "news_papers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "toys"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "stamps"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-cards"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telephone_vouchers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicycle"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "condoms"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "excrement_bags"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Account or loyalty cards"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Butcher"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Edit Butcher"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Edit Baker"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Edit Florist"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Organic"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Edit Organic Shop"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alcohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Edit Alcohol Shop"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Beverages"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Edit Beverages Shop"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Edit Computer Shop"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Electronics"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Edit Electronics Shop"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Edit Hifi Shop"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Furniture"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Edit Furniture Shop"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Garden Centre"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Edit Garden Centre"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Hardware"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Edit Hardware Store"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Do-it-yourself-store"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Edit Do-it-yourself-store"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Stationery"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Edit Stationery Shop"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Hairdresser"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Edit Hairdresser"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Shoes"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Edit Shoe Shop"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Toys"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Edit Toy Shop"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Edit Video Shop"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Dry Cleaning"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Edit Dry Cleaning"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Laundry"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Edit Laundry"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Edit Outdoor Shop"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Edit Sports Shop"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optician"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Edit Optician"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Cash"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -27541,14 +27483,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Edit Bank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Automated Teller Machine"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Money Exchange"
@@ -27556,5 +27498,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Edit Money Exchange"
@@ -27562,15 +27504,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Edit Automated Teller Machine"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Health"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Doctors"
@@ -27578,18 +27520,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Edit Doctors"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dentist"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Edit Dentist"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Pharmacy"
@@ -27597,5 +27539,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Edit Pharmacy"
@@ -27603,9 +27545,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Dispensing"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hospital"
@@ -27613,10 +27555,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Edit Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Emergency Access Point"
@@ -27625,5 +27567,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Edit Emergency Access Point"
@@ -27632,20 +27574,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Point Number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Point Name"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Phone Number"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use international code, like +12-345-67890)"
@@ -27653,5 +27595,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinary"
@@ -27660,64 +27602,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Edit Veterinary"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geography"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Places"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Edit Continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Country"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Edit Country"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "State"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Edit State"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Edit Region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "County"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Edit County"
@@ -27725,15 +27667,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "City"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Edit City"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Town"
@@ -27741,10 +27683,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Edit Town"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Suburb"
@@ -27752,25 +27694,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Edit Suburb"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Edit Village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Hamlet"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Edit Hamlet"
@@ -27778,5 +27720,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Locality"
@@ -27784,10 +27726,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Edit Locality"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Island"
@@ -27795,10 +27737,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Edit Island"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Islet"
@@ -27806,5 +27748,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Edit Islet"
@@ -27812,5 +27754,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Cave Entrance"
@@ -27818,10 +27760,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Edit Cave Entrance"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Peak"
@@ -27829,10 +27771,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Edit Peak"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Glacier"
@@ -27840,10 +27782,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Edit Glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Volcano"
@@ -27851,70 +27793,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Edit Volcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Boundaries"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "National"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Edit National Boundary"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Edit Administrative Boundary"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Edit Civil Boundary"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Political"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Edit Political Boundary"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "National park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Edit National Park Boundary"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Land use"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Tree"
@@ -27923,15 +27865,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Edit Tree"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanical Name"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Wood"
@@ -27940,5 +27882,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Edit Wood"
@@ -27946,17 +27888,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "coniferous"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "deciduous"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "mixed"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Forest"
@@ -27965,14 +27907,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Edit Forest Landuse"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Nature Reserve"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Edit Nature Reserve"
@@ -27980,25 +27922,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Scree"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Edit Scree"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Scrub"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Edit Scrub"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Fell"
@@ -28006,10 +27948,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Edit Fell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Heath"
@@ -28017,5 +27959,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Edit Heath"
@@ -28023,5 +27965,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Farmyard"
@@ -28030,45 +27972,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Edit Farmyard Landuse"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Farmland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Edit Farmland Landuse"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Meadow"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Edit Meadow Landuse"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vineyard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Edit Vineyard Landuse"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Allotments"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Edit Allotments Landuse"
@@ -28076,25 +28018,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Garden"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Edit Garden"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Grass"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Edit Grass Landuse"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Village Green"
@@ -28102,10 +28044,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Edit Village Green Landuse"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Common"
@@ -28113,20 +28055,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Edit Common"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Edit Park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Recreation Ground"
@@ -28134,5 +28076,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edit Recreation Ground Landuse"
@@ -28140,15 +28082,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Residential area"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Edit Residential Landuse"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Graveyard"
@@ -28156,9 +28098,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Edit Graveyard"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cemetery"
@@ -28166,39 +28108,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Edit Cemetery Landuse"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Retail"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Edit Retail Landuse"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Commercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Edit Commercial Landuse"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Edit Industrial Landuse"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Railway land"
@@ -28206,15 +28148,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Edit Railway Landuse"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Military"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Edit Military Landuse"
@@ -28222,50 +28164,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Construction area"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Edit Construction Landuse"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Brownfield"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Edit Brownfield Landuse"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Greenfield"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Edit Greenfield Landuse"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Landfill"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Edit Landfill Landuse"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Quarry"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Edit Quarry Landuse"
@@ -28275,5 +28217,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Edit Multipolygon"
@@ -28282,10 +28224,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "outer segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "inner segment"
@@ -28293,5 +28235,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Turn restriction"
@@ -28300,5 +28242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Edit Turn Restriction"
@@ -28306,34 +28248,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "no left turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "no right turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "no straight on"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "no U turn"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "only turn right"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "only turn left"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "only straight on"
@@ -28342,15 +28284,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "from way"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "via node or way"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "to way"
@@ -28358,5 +28300,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Route"
@@ -28365,5 +28307,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Edit Route"
@@ -28371,5 +28313,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Route type"
@@ -28460,5 +28402,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28468,17 +28410,17 @@
 msgstr "bicycle"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "road"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -28538,5 +28480,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28545,9 +28487,9 @@
 msgstr "foot"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "detour"
@@ -28561,10 +28503,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "subway"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbol description"
@@ -28572,31 +28514,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Network"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Route state"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "proposed"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternate"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporary"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "connection"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Colour (hex)"
@@ -28605,32 +28547,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "route segment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "forward segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "backward segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "halt point"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "forward halt point"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "backward halt point"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -32653,4 +32670,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
+
+#~ msgid "Bikes"
+#~ msgstr "Bikes"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/es.po
===================================================================
--- /applications/editors/josm/i18n/po/es.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/es.po	(revision 20945)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-13 17:13+0000\n"
-"Last-Translator: Emilio Gomez Fernandez <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-19 20:11+0000\n"
+"Last-Translator: DiegoJ <diegojromerolopez@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:38+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:54+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1216,5 +1216,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Imposible mover objetos fuera del mundo."
@@ -1544,5 +1544,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2319,9 +2319,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2404,28 +2404,28 @@
 msgstr "Finalizar dibujo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extruir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Crear áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extruir vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 "Mover un segmento a lo largo de su normal y luego soltar el botón del mouse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Dibujar un rectángulo del tamaño deseado, después soltar el botón del ratón."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2448,6 +2448,6 @@
 "en ese punto."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2459,9 +2459,9 @@
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Seleccionar, mover y rotar objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2470,17 +2470,17 @@
 msgstr[1] "Añadir y mover un nuevo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Moverlos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Deshacer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2493,10 +2493,10 @@
 "¿Desea desplazarlos realmente?"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
-msgid "Release the mouse button to select the objects in the rectangle."
-msgstr ""
-"Soltar el botón del ratón para seleccionar los objetos en el rectángulo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2505,9 +2505,9 @@
 "más cercano."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar el botón del ratón para parar de rotar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3279,5 +3279,5 @@
 msgstr "¿Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3885,17 +3885,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "estándar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Conexión"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "etiquetado"
+msgstr ""
 
 #. teal
@@ -4080,5 +4077,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "ferrocarril"
@@ -5428,5 +5425,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "todos"
@@ -5859,4 +5856,9 @@
 msgstr "Modo de filtro"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5948,5 +5950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relaciones"
@@ -6048,9 +6050,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Desacoplar el panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6059,5 +6061,5 @@
 "herramientas de la izquierda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Haga click para minimizar/maximizar el contenido del panel"
@@ -6395,4 +6397,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6405,10 +6413,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7078,145 +7080,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nombre"
@@ -8480,10 +8482,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Tipo"
@@ -8491,5 +8493,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8503,17 +8504,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "desconocido"
@@ -9307,11 +9307,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9328,14 +9330,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Capa"
@@ -9884,5 +9886,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Descripción"
@@ -10972,55 +10974,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11518,5 +11520,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Coche"
@@ -11538,16 +11540,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicicleta"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11577,12 +11580,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Pie"
@@ -12298,12 +12301,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nombre de la calle"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Valores medidos"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14636,6 +14637,7 @@
 msgstr "Subir trazas"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibilidad"
@@ -14727,5 +14729,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolación de números de portales"
@@ -14922,5 +14924,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14961,19 +14963,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Edificios"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14981,5 +14983,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14992,10 +14994,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15037,7 +15039,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Archivo caché de la zona Lambert 2 (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15181,5 +15182,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17060,5 +17061,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Transporte público"
@@ -17110,5 +17111,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Nodos de Vía"
@@ -17692,4 +17693,22 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Tipo"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Desde ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17846,4 +17865,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Crear restricción de giro a la izquierda Michigan"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Restricción de giro"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18344,13 +18377,13 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:85
 msgid "Validation errors"
-msgstr "Validación de errores"
+msgstr "Errores de validación"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:97
 msgid "No validation errors"
-msgstr "Sin validación de errores"
+msgstr "Sin errores de validación"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:169
 msgid "Grid"
-msgstr "Rejilla"
+msgstr "Cuadrícula"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/OSMValidatorPlugin.java:277
@@ -18616,5 +18649,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -20007,7 +20040,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referencia"
@@ -20024,5 +20057,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Carriles"
@@ -20040,4 +20073,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20045,9 +20079,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Velocidad max. (km/h)"
@@ -20075,15 +20108,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20094,11 +20121,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Sentido único"
@@ -20118,15 +20144,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20143,11 +20167,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20168,8 +20192,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20187,11 +20211,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Túnel"
@@ -20211,6 +20235,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20228,11 +20252,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Desmonte"
@@ -20252,6 +20276,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20269,11 +20293,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Terraplén"
@@ -20411,5 +20435,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Lugares de cruce frecuente de la vía"
@@ -20418,12 +20442,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20431,13 +20458,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Anchura (metros)"
@@ -20466,24 +20493,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Superficie"
@@ -20495,5 +20518,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20507,11 +20530,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "pavimentada"
@@ -20519,10 +20541,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "sin pavimentar"
@@ -20530,10 +20552,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asfalto"
@@ -20541,11 +20563,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "hormigón"
@@ -20553,10 +20574,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "metal"
@@ -20564,10 +20585,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "bosque"
@@ -20575,10 +20596,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "pavimento adoquinado"
@@ -20586,11 +20607,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "adoquinado"
@@ -20598,10 +20618,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "grava"
@@ -20609,10 +20629,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "grijo"
@@ -20620,10 +20640,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "compactado"
@@ -20631,10 +20651,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "pavimento vegetal (de celosía)"
@@ -20642,10 +20662,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "hierba"
@@ -20653,10 +20673,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "arena"
@@ -20664,10 +20684,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "tierra"
@@ -20748,6 +20768,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Carretera (tipología desconocida)"
@@ -20756,5 +20775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Editar carretera (tipología desconocida)"
@@ -20762,6 +20781,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "En construcción"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Editar una vía en construcción"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Intersección"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rotonda"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Restricciones de tráfico"
@@ -20770,15 +20818,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Editar restricciones de tráfico"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Peaje"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Sin salida (cul-de-sac)"
@@ -20786,5 +20834,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Acceso"
@@ -20826,28 +20874,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "sí"
@@ -20860,10 +20907,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20877,10 +20924,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20904,97 +20951,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permisivo"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "agrícola"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "forestal"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "reparto de mercancías"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "autorizado"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "oficial"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Mercancías"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Vehículos pesados (> 6 t.)"
@@ -21009,10 +21056,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Caballo"
@@ -21028,10 +21075,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -21046,19 +21093,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Automóvil"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Vehículos de servicio público (SP)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Velocidad mínima (km/h)"
@@ -21066,20 +21113,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (t)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Altura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Anchura max. (en metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Longitud max. (en metros)"
@@ -21087,5 +21134,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rotonda"
@@ -21096,5 +21143,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Editar una intersección"
@@ -21114,10 +21161,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autopista"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "Acceso a autopista"
@@ -21139,10 +21186,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "Carretera principal"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "Enlace a carretera principal"
@@ -21164,10 +21211,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "vía primaria"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "acceso a vía primaria"
@@ -21189,5 +21236,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21202,9 +21249,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "carretera local"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "carretera sin clasificación"
@@ -21218,9 +21265,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "calle urbana"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "calle residencial"
@@ -21250,10 +21297,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "vía de servicio"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "carril bus guiado"
@@ -21283,5 +21330,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21293,10 +21340,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Editar un puente"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Editar túnel"
@@ -21304,39 +21351,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Vías"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "En construcción"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Editar una vía en construcción"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Intersección"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rotonda"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Pista"
@@ -21345,73 +21363,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Editar una pista"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Tipo de pista"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "Grado 1 (pavimentada)"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "Grado 2 (de áridos o zahorra)"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "Grado 3 (de áridos con vegetación entre rodaduras)"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "Grado 4 (de tierra con vegetación entre rodaduras)"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "Grado 5 (con rodaduras apenas visibles entre la vegetación)"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "Escala MTB"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "Escala SAC"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "senda"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "senda de montaña"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "senda de montaña exigente"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "senda alpina"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "senda alpina exigente"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "senda alpina dificil"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Camino (genérico, sin uso específico)"
@@ -21420,38 +21406,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Editar camino"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "Escala SAC"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "senda"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "senda de montaña"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "senda de montaña exigente"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "senda alpina"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "senda alpina exigente"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "senda alpina dificil"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "excelente"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "buena"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermedia"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "mala"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "pésima"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Sillas de ruedas"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Esquí"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Trineo"
@@ -21460,5 +21476,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Camino de herradura dedicado"
@@ -21466,5 +21482,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Editar vía ecuestre"
@@ -21472,5 +21488,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Carril bici dedicado"
@@ -21488,11 +21504,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Editar vía ciclable"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Peatones"
@@ -21500,5 +21516,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Carril bici y vía peatonal separados"
@@ -21506,5 +21522,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Carril bici y vía peatonal conjuntos"
@@ -21512,5 +21528,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Acera peatonal dedicada"
@@ -21519,15 +21535,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Editar vía peatonal"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Bicicletas"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Escaleras"
@@ -21537,10 +21549,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Editar tramo de escaleras"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Salida de autopista"
@@ -21548,15 +21560,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Editar salida de autopista"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Servicios"
@@ -21564,5 +21576,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Editar estación de servicio"
@@ -21602,17 +21614,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operador"
@@ -21621,5 +21633,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Semáforo"
@@ -21629,5 +21641,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruce peatonal"
@@ -21636,27 +21648,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "sin supervisión"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "semáforos"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "isla"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "sin marcar"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Cruce de caballos"
@@ -21664,6 +21676,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Cruce de bicicletas"
@@ -21672,11 +21684,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Guarda cruces"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Tipo de nombre de cruce (Reino Unido)"
@@ -21684,30 +21696,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "cebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelícano"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "tucán"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "frailecillo"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegaso"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21715,5 +21727,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Paso peatonal"
@@ -21722,14 +21734,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Editar cruce"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Tipo de nombre (Reino Unido)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Calmado de tráfico"
@@ -21737,33 +21749,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Editar calmado de tráfico"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "badén de lomo de asno"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "chicane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "garganta"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "cojín berlines"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "resalte"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "plataforma elevada"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Lugar de cruce frecuente de la vía"
@@ -21771,5 +21783,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Editar lugar de cruce frecuente de la vía"
@@ -21777,5 +21789,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-rotonda"
@@ -21786,14 +21798,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Dirección"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "agujas del reloj"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Círculo de giro"
@@ -21803,5 +21815,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Límite de ciudad"
@@ -21809,15 +21821,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Editar la señal de límite de ciudad"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Nombre alternativo"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Rádar de tráfico"
@@ -21826,5 +21838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Teléfono de emergencia"
@@ -21832,5 +21844,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Pendiente"
@@ -21838,5 +21850,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Pendiente pronunciada"
@@ -21844,5 +21856,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Contenedor de gravilla"
@@ -21852,10 +21864,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Vado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Editar vado"
@@ -21863,5 +21875,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Puerto de montaña"
@@ -21869,5 +21881,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Editar puerto de montaña"
@@ -21879,7 +21891,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Altitud"
@@ -21887,5 +21899,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barreras"
@@ -21893,5 +21905,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Bolardo"
@@ -21899,5 +21911,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Editar un bolardo"
@@ -21942,16 +21954,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Tráfico permitido:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Barrera para bicicletas"
@@ -21960,5 +21972,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Bloques"
@@ -21966,5 +21978,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Barrera canadiense"
@@ -21972,10 +21984,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Editar barrera canadiense"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Trampa para coches"
@@ -21983,15 +21995,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Pinchos"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Editar pinchos"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Cabina de peaje"
@@ -21999,5 +22011,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Editar cabina de peaje"
@@ -22005,10 +22017,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Aduana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Editar aduana"
@@ -22018,5 +22030,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Seto"
@@ -22027,22 +22039,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Valla o cerca"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Muro"
@@ -22050,5 +22062,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Muralla"
@@ -22057,5 +22069,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Muro de contención"
@@ -22067,10 +22079,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Editar una entrada"
@@ -22078,5 +22090,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Puerta"
@@ -22084,30 +22096,30 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Editar puerta"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Barrera"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Editar una barrera"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Editar portilla de malla metálica"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
@@ -22115,20 +22127,20 @@
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Editar puerta de golpe"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Portilla giratoria"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Editar portilla giratoria"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Escalera de paso"
@@ -22136,25 +22148,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Editar una escalera de paso"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Torno"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Editar torno"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Poterna"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Editar poterna"
@@ -22165,11 +22177,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Lámina de agua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Fuente"
@@ -22177,5 +22189,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Editar fuente"
@@ -22183,5 +22195,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Desagüe"
@@ -22189,10 +22201,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Editar canal de desagüe"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Acequia"
@@ -22200,10 +22212,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Editar acequia"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Arroyo o riachuelo"
@@ -22211,10 +22223,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "editar arroyo o riachuelo"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Canal"
@@ -22222,10 +22234,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Editar un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Río"
@@ -22235,5 +22247,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Editar un río"
@@ -22241,15 +22253,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Editar lámina de agua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Suelo"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Editar suelo"
@@ -22257,15 +22269,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Cuenca"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Editar cuenca"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Embalse"
@@ -22273,15 +22285,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Editar embalse"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Depósito de agua"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Editar depósito de agua"
@@ -22289,5 +22301,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Ribera (para orillas de ríos anchos)"
@@ -22296,10 +22308,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Editar ribera"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Pantano"
@@ -22310,14 +22322,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Editar pantano"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Ciénaga"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "ciénaga"
@@ -22331,35 +22343,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marísma"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "juncal"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "saladar"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "superficie mareal"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "manglar"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Lodazal"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Editar lodazal"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Playa"
@@ -22367,20 +22379,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Editar playa"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Bahía"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Editar bahía"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Acantilado"
@@ -22388,10 +22400,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Editar acantilado"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Línea de costa"
@@ -22399,5 +22411,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Editar línea de costa"
@@ -22405,5 +22417,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Ruta de ferry"
@@ -22411,5 +22423,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Editar una ruta de ferry"
@@ -22418,5 +22430,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Astillero"
@@ -22424,10 +22436,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Editar un astillero"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Muelle"
@@ -22435,5 +22447,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Editar un muelle"
@@ -22441,5 +22453,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Presa"
@@ -22447,15 +22459,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Editar una presa"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Nodo en vía fluvial"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Esclusa"
@@ -22464,5 +22476,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Represa"
@@ -22470,20 +22482,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Editar una represa"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Cascada"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Editar una cascada"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Ensanche para giro"
@@ -22492,15 +22504,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Puerto deportivo"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Editar puerto deportivo"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Embarcadero"
@@ -22508,10 +22520,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Editar embarcadero"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Terminal de ferry"
@@ -22519,10 +22531,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Editar la terminal de ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Rampa"
@@ -22532,20 +22544,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Editar rampa"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Ferrocarril"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Vía de tren"
@@ -22553,5 +22565,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Ediar vía de tren"
@@ -22581,86 +22593,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "estándar"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22672,8 +22609,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22687,29 +22624,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "yarda"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "vía muerta"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "ramal"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22722,8 +22659,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22794,8 +22731,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22807,8 +22744,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltaje"
@@ -22821,8 +22758,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22835,23 +22772,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Vía estrecha"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Editar vía estrecha"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monoraíl"
@@ -22859,50 +22796,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Editar monoraíl"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Vía para tren histórico"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Editar vía para tren histórico"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Metro ligero"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Editar metro ligero"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Editar metro"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tranvía"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Editar tranvía"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Vía para autobús guiado"
@@ -22910,5 +22847,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Editar vía para autobús guiado"
@@ -22917,10 +22854,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Vía de tren en desuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Editar vía de tren en desuso"
@@ -22929,9 +22866,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Tipos opcionales"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Vía de tren abandonada"
@@ -22940,5 +22877,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Paso a nivel"
@@ -22947,5 +22884,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Paso a nivel peatonal"
@@ -22955,5 +22892,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Tipo de paso"
@@ -22961,5 +22898,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Plataforma de giro"
@@ -22968,5 +22905,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Tope de vía"
@@ -22975,10 +22912,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Remonte"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Telesilla"
@@ -22986,10 +22923,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Editar telesilla"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Telearrastre"
@@ -22997,10 +22934,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Editar telearrastre"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Telecabina"
@@ -23008,10 +22945,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Ediatr telecabina"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Góndola"
@@ -23019,10 +22956,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Editar góndola"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23031,5 +22968,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23037,5 +22974,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23044,5 +22981,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23050,5 +22987,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Gasolinera"
@@ -23058,62 +22995,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Ediatr gasolinera"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -23171,32 +23108,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Horario de apertura"
@@ -23255,165 +23192,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Vie 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -23430,5 +23367,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23438,5 +23375,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Editar aparcamiento"
@@ -23447,25 +23384,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Número de referencia"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "de pisos"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "al aire libre"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "subterráneo"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Aparcamiento disuasorio (Park & Ride)"
@@ -23474,48 +23411,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "De pago"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Capacidad (en general)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Plazas para Personas de Movilidad Reducida"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Espacios para la mujer"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Espacios para padres"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Ver en la Wiki para otra capacidad: [types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Limpieza"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Editar lavado de vehículos"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Taller"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Editar reparación de automóviles"
@@ -23523,5 +23460,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Alquiler"
@@ -23530,10 +23467,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Editar alquiler de automóviles"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Compartido"
@@ -23541,5 +23478,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Editar automóviles compartidos"
@@ -23547,10 +23484,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Editar aparcamiento para bicicletas"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacidad (Coches)"
@@ -23559,10 +23496,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Editar alquiler de bicicletas"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23572,5 +23509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23578,5 +23515,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Referencia"
@@ -23584,5 +23521,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Apeadero de ferrocarril"
@@ -23590,5 +23527,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Editar apeadero"
@@ -23596,5 +23533,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Parada de tranvía"
@@ -23603,5 +23540,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Editar parada de tranvía"
@@ -23609,5 +23546,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Andén de ferrocarril"
@@ -23616,5 +23553,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Editar andén de ferrocarril"
@@ -23626,5 +23563,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Referencia (número de pista)"
@@ -23632,10 +23569,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Boca de metro"
@@ -23644,10 +23581,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Editar boca de metro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Silla de ruedas"
@@ -23656,5 +23593,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Estación de autobús"
@@ -23663,5 +23600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Editar estación de autobús"
@@ -23669,5 +23606,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Parada de autobús"
@@ -23677,5 +23614,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Editar parada de autobús"
@@ -23684,6 +23621,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Refugio"
@@ -23691,19 +23628,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Pavimento táctil"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Andén de autobús"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Editar andén de autobús"
@@ -23711,5 +23648,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23717,5 +23654,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Editar parada de taxi"
@@ -23723,10 +23660,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Aeropuerto"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Campo de aviación"
@@ -23734,5 +23671,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Editar campo de aviación"
@@ -23740,10 +23677,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23752,5 +23689,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Pista"
@@ -23758,5 +23695,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Editar pista"
@@ -23764,5 +23701,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Pista de rodaje"
@@ -23770,5 +23707,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Editar pista de rodaje"
@@ -23776,5 +23713,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Pista de aterrizaje de helicópteros"
@@ -23782,5 +23719,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Editar pista de aterrizaje de helicópteros"
@@ -23790,5 +23727,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Plataforma de estacionamiento"
@@ -23798,5 +23735,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -23807,6 +23744,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Baliza"
@@ -23816,5 +23753,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Manga de viento"
@@ -23823,5 +23760,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23829,5 +23766,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23835,15 +23772,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Turismo"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Alojamiento"
@@ -23855,5 +23792,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23862,15 +23799,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Editar hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Estrellas"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23878,20 +23815,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Editar motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Pensión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Editar pensión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Cabaña o bungalow"
@@ -23899,10 +23836,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Editar cabaña o bungalow"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Albergue"
@@ -23910,30 +23847,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Editar albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Editar cabaña alpina"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Editar zona de caravanas"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Lugar de acampada"
@@ -23941,10 +23878,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Editar lugar de acampada"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Comida+Bebidas"
@@ -23955,5 +23892,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -23961,5 +23898,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Editar restaurante"
@@ -23967,5 +23904,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cocina"
@@ -23973,73 +23910,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italiano"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chino"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizzería"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburguesería"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "griego"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "alemán"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "india"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turco"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiático"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "tailandés"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexicano"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japonés"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Establecimiento de comida rápida"
@@ -24047,17 +23984,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar establecimiento de comida rápida"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Cafetería"
@@ -24065,9 +24002,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Editar cafetería"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -24075,18 +24012,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Editar pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Editar biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24094,9 +24031,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Club nocturno"
@@ -24104,24 +24041,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Editar club nocturno"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Atracción"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Editar atracción"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museo"
@@ -24129,9 +24066,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Editar museo"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24140,9 +24077,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Editar zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Panorámica"
@@ -24150,24 +24087,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Editar panorámica"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Torre de vigía"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Parque temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Editar parque temático"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Trabajo artístico"
@@ -24175,5 +24112,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Editar trabajo artístico"
@@ -24181,19 +24118,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Oficina de información"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Grado de detalle"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topográfico"
@@ -24231,5 +24168,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24237,28 +24174,28 @@
 msgstr "calle"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Mostrar área"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "sitio"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "ciudad"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "región"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Descripción detallada"
@@ -24268,5 +24205,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Rutas mostradas para:"
@@ -24274,5 +24211,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Sendero"
@@ -24280,6 +24217,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -24287,5 +24224,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Bicicleta de montaña"
@@ -24293,6 +24230,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Esquí"
@@ -24300,5 +24237,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Equitación"
@@ -24306,46 +24243,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... otros modos de desplazamiento posible"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Panel informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Tablón de anuncios"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "aviso"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "naturaleza"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "vida salvaje"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "plantas"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Poste indicador"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Punto de información"
@@ -24353,29 +24290,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Descripción detallada"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audioguía"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "¿Audioguía a través de teléfono móvil?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Número de teléfono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Otros Puntos de Información"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Editar refugio"
@@ -24383,25 +24320,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Barbacoa"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Zona de picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Editar zona de picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Lugares históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Castillo"
@@ -24410,19 +24347,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Editar castillo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruinas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Editar ruinas"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Lugar arqueológico"
@@ -24431,9 +24368,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Editar lugar arqueológico"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Campo de batalla"
@@ -24441,10 +24378,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Editar campo de batalla"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Sitio paleontológico"
@@ -24452,5 +24389,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Editar sitio paleontológico"
@@ -24458,15 +24395,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editar monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Monumento conmemorativo"
@@ -24474,55 +24411,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Editar monumento conmemorativo"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Crucero"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Editar crucero"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Humilladero"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Editar humilladero"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Mojón"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Editar mojón"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Ocio"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parque acuático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Editar parque acuático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Zona de juegos"
@@ -24530,35 +24467,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Editar zona de juegos"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Editando pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Deportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Instalaciones deportivas"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Estadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Editar estadio"
@@ -24572,6 +24509,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "seleccionar deporte:"
@@ -24963,6 +24900,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24996,225 +24933,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "diversos"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tiro con arco"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "fútbol australiano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "béisbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "baloncesto"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bolos"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "piragua"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Cricket con redes"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "carrera de perros"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "hípica"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fútbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnasia"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "carrera de caballos"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota vasca"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "raqueta"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "monopatín"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "patinaje"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "esquí"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Fútbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natación"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tenis de mesa"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Polideportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Editar polideportivo"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
-msgstr "Campo de juego"
+msgstr "Cancha de juego"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
-msgstr "Editar campo de juego"
-
-#: build/trans_presets.java:1930
+msgstr "Editar cancha de juego"
+
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Pista de carreras"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Editar pista de carreras"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Campo de golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Editar campo de golf"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Editar mini golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Deporte"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Editar multi"
@@ -25253,21 +25190,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tipo"
@@ -25306,203 +25243,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
-msgstr "campo de juego"
-
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+msgstr "cancha de juego"
+
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "Polideportivo"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "Estadio"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "pista"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Editar bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletismo"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Editar atletismo"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tiro con arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Editar tiro con arco"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Alpinismo"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Editar alpinismo"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Piragüismo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Editar piragüismo"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Editar ciclismo"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Carreras de perros"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Editar carreras de perros"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Hípica"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Editar hípica"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Carreras de caballos"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Editar carreras de caballos"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gimnasia"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Editar gimnasia"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Deportes de motor"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Editar deportes de motor"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Patinaje"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Editar patinaje"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Monopatín"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Editar monopatín"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Natación"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Editar natación"
@@ -25510,52 +25447,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Editar esquí"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Tipo de pista de esquí"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "de descenso"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nórdico"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "parque de snowboard"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Dificultad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "novato"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "fácil"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanzado"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "experto"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "fuera de pista"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Tiro"
@@ -25563,177 +25500,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Editar tiro"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Deporte (Pelota)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fútbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Editar fútbol"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Fútbol americano"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Editar fútbol americano"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Fútbol australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Editar fútbol australiano"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Béisbol"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Editar béisbol"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Baloncesto"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Editar baloncesto"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Editar golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "campo de golf"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Editar boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bolos"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Editar bolos"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edit cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket con redes"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Editar cricket con redes"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Editar croquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Editar hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota vasca"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Editar pelota vasca"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Raqueta"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Editar raqueta"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Editar rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Ping-pong"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Editar ping-pong"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Editar tenis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificial"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Edificio"
@@ -25741,5 +25678,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Edificio público"
@@ -25747,10 +25684,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Editar edificio público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Ayuntamiento"
@@ -25758,10 +25695,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Editar ayuntamiento"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embajada"
@@ -25769,10 +25706,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editar embajada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Juzgado"
@@ -25781,10 +25718,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Editar juzgado"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prisión"
@@ -25793,10 +25730,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Editar prisión"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policía"
@@ -25806,10 +25743,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Editar policía"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Parque de bomberos"
@@ -25818,10 +25755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Editar parque de bomberos"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Oficina postal"
@@ -25829,5 +25766,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Editar oficina postal"
@@ -25835,15 +25772,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Editar jardín de infancia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Escuela"
@@ -25851,10 +25788,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Editar escuela"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universidad"
@@ -25862,10 +25799,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Editar universidad"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Instituto de enseñanza secundaria"
@@ -25873,5 +25810,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Editar instituto de enseñanza secundaria"
@@ -25879,5 +25816,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cine"
@@ -25886,10 +25823,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Editar cine"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -25898,9 +25835,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Editar biblioteca"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro de arte"
@@ -25908,10 +25845,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Editar centro de arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -25920,10 +25857,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Editar teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lugar de culto"
@@ -25933,5 +25870,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Editar lugar de culto"
@@ -25940,6 +25877,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religión"
@@ -25948,66 +25885,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahaísta"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "cristiana"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindú"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jainista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judía"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "musulmana"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sijista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "espiritualista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroástrica"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Confesión"
@@ -26016,81 +25953,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglicano"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "católico"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangélico"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "testigos de Jehová"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luterano"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormón"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoxo"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbiteriano"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "cuáquero"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "chiita"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "suní"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Direcciones"
@@ -26099,5 +26036,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editar direcciones"
@@ -26105,5 +26042,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Número de portal"
@@ -26111,25 +26048,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nombre del edificio"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nombre de la calle"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nombre de la ciudad"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Código postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Código del país"
@@ -26138,5 +26075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Editar interpolación de números de portales"
@@ -26144,61 +26081,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Esquema numérico"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "impares"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "pares"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Construcciones"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Editar fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Editar torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tipo de torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "comunicación"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observación"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altura (en metros)"
@@ -26206,25 +26143,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre de agua"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Editar torre de agua"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasómetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Editar gasómetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Faro"
@@ -26232,10 +26169,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Editar faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Molino de viento"
@@ -26243,10 +26180,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Editar molino de viento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Tubería"
@@ -26255,41 +26192,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Editar tubería"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "térmico"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "aceite"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "aguas residuales"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "cualquier sustancia"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localización"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "sumergido"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "en superficie"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Depuradora"
@@ -26299,10 +26236,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Editar depuradora"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Grúa"
@@ -26310,5 +26247,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Editar grúa"
@@ -26316,10 +26253,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Editar baliza"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vértice geodésico"
@@ -26327,10 +26264,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Editar vértice geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Cámara de vigilacia"
@@ -26338,23 +26275,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Editar cámara de vigilancia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Generador de energía"
@@ -26364,35 +26301,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Editar generador de energía"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "eólico"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hidráulico"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fósil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "carbón"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Central eléctrica"
@@ -26401,10 +26338,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Editar central eléctrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Subestación eléctrica"
@@ -26413,5 +26350,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Editar subestación eléctrica"
@@ -26419,10 +26356,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Línea de referencia"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Torre de electricidad"
@@ -26433,23 +26370,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Editar torre de electricidad"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "poste"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Referencia de la torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Tendido eléctrico"
@@ -26458,74 +26395,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Editar tendido eléctrico"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Tipo de línea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "alta tensión"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "baja tensión"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Cantidad de cables"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de alambres (mejor: conductores) por cable de tensión"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "sencillo"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "doble"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quad"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Servicios"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Baños"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Buzón de correos"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Teléfono"
@@ -26534,5 +26471,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Editar teléfono"
@@ -26540,5 +26477,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Monedas"
@@ -26546,5 +26483,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Billetes"
@@ -26552,5 +26489,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Tarjetas de recarga y monederos electrónicos"
@@ -26558,5 +26495,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Tarjetas de débito"
@@ -26564,15 +26501,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Tarjetas de crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Tarjetas telefónicas"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Reciclaje"
@@ -26581,5 +26518,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Editar punto limpio"
@@ -26587,35 +26524,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Baterías"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Envases"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Ropas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Vidrio"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Chatarra"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Cubo de basuras"
@@ -26623,5 +26560,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Editar cubo de basuras"
@@ -26630,31 +26567,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Backrest"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Material"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "piedra"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Color"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "negro"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "marrón"
@@ -26733,5 +26670,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26741,31 +26678,31 @@
 msgstr "zona verde"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "red"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "blanco"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Número de asientos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Apostadero de caza"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Editar apostadero de caza"
@@ -26774,30 +26711,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "profundidad"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "media"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "total"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Oculto"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Esclusa"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fuente"
@@ -26806,10 +26743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Editar fuente"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Agua potable"
@@ -26818,10 +26755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Editar agua potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Hidrante contra incendios"
@@ -26830,5 +26767,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Editar hidrante contra incendios"
@@ -26836,5 +26773,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Caja tibia"
@@ -26842,15 +26779,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Editar caja tibia"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Comercios"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Concesionario de automóviles"
@@ -26858,10 +26795,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Editar concesionario de automóviles"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Tienda de bicicletas"
@@ -26870,28 +26807,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Editar tienda de bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Editar supermercado"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Farmacia"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Editar farmacia"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Tienda de alimentación"
@@ -26899,9 +26836,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Editar tienda de alimentación"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosco"
@@ -26909,27 +26846,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Editar kiosco"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Librería"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Editar librería"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Agencia de viajes"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Editar agencia de viajes"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Carnicería"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Editar carnicería"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Panadería"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Editar panadería"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Floristería"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Editar floristería"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Tienda de productos orgánicos"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Editar tienda de productos orgánicos"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Tienda de bebidas alcohólicas"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Editar tienda de bebidas alcohólicas"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Bebidas"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Editar tienda de bebidas"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Tienda de informática"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Editar tienda de informática"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Electrónica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Editar tienda de electrónica"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Editar Tienda Hifi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Muebles"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Editar mueblería"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Centro de jardinería"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Editar centro de jardinería"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Ferretería"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Editar ferretería"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Almacén de bricolaje"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Editar almacén de bricolaje"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Papelería"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Editar papelería"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Peluquería"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Editar peluquería"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Zapatos"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Editar zapatería"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Juguetes"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Editar juguetería"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Editar tienda de videos"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Tintorería"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Editar tintorería"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Lavandería"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Editar lavandería"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Tienda de actividades al aire libre"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Editar tienda de actividades al aire libre"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Editar tienda de material de deportes"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Óptica"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Editar óptica"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Máquina expendedora"
@@ -26937,5 +27088,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Editar máquina expendedora"
@@ -26943,306 +27094,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Expendedor automático de productos"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "billetes de de transporte público"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "abonos de transporte público"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "billetes de aparcamiento"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "Alimentación"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "Bebidas"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "Caramelos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "Estanco"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "comida para animales"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "Periódicos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "juguetes"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "sellos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "Tarjetas SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "Tarjetas telefónicas"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "Bonos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicicleta"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "condones"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampones"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "Bolsas para excrementos"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Tarjetas de fidelización o descuento"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Carnicería"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Editar carnicería"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Panadería"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Editar panadería"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Floristería"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Editar floristería"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Tienda de productos orgánicos"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Editar tienda de productos orgánicos"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Tienda de bebidas alcohólicas"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Editar tienda de bebidas alcohólicas"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Bebidas"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Editar tienda de bebidas"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Tienda de informática"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Editar tienda de informática"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Electrónica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Editar tienda de electrónica"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Editar Tienda Hifi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Muebles"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Editar mueblería"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Centro de jardinería"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Editar centro de jardinería"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Ferretería"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Editar ferretería"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Almacén de bricolaje"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Editar almacén de bricolaje"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Papelería"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Editar papelería"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Peluquería"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Editar peluquería"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Zapatos"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Editar zapatería"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Juguetes"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Editar juguetería"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Editar tienda de videos"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Tintorería"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Editar tintorería"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Lavandería"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Editar lavandería"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Tienda de actividades al aire libre"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Editar tienda de actividades al aire libre"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Editar tienda de material de deportes"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Óptica"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Editar óptica"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Dinero en efectivo"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banco"
@@ -27250,14 +27193,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Editar banco"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Cajero automático"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Cambio de moneda"
@@ -27265,5 +27208,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Editar cambio de moneda"
@@ -27271,15 +27214,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Editar cajero automático"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Centro médico"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr ""
@@ -27288,18 +27231,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Editar médicos"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Editar dentista"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Farmacia/Parafarmacia"
@@ -27307,5 +27250,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Editar farmacia/parafarmacia"
@@ -27313,9 +27256,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Expende con receta médica"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hospital"
@@ -27323,10 +27266,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Editar hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Punto de acceso para emergencias"
@@ -27335,5 +27278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Editar punto de acceso para emergencias"
@@ -27342,20 +27285,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Número de punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Nombre del Punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Número de teléfono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utilizar código internacional, como +12-345-67890)"
@@ -27363,5 +27306,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -27370,64 +27313,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Editar veterinario"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografía"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Editar continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Editar país"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Estado/Provincia"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Editar estado/provincia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Región"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Editar región"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Municipio"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Editar municipio"
@@ -27435,15 +27378,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Ciudad (>100.000 hab.)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Editar ciudad (>100.00 hab.)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Ciudad (10.000 - 100.000 hab.)"
@@ -27451,10 +27394,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Editar ciudad (10.000 - 100.000 hab.)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr ""
@@ -27464,5 +27407,5 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr ""
@@ -27471,15 +27414,15 @@
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Editar población (< 10.000 hab.)"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr ""
@@ -27487,5 +27430,5 @@
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr ""
@@ -27495,5 +27438,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Paraje"
@@ -27501,10 +27444,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Editar paraje"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Isla"
@@ -27512,10 +27455,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Editar isla"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Islote"
@@ -27523,5 +27466,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Editar islote"
@@ -27529,5 +27472,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Entrada de cueva"
@@ -27535,10 +27478,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Editar entrada de cueva"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Pico"
@@ -27546,10 +27489,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Editar pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Glaciar"
@@ -27557,10 +27500,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Editar glaciar"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Volcán"
@@ -27568,70 +27511,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Editar volcán"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Fronteras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Editar frontera nacional"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrativa"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Editar frontera administrativa"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Editar frontera civil"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Editar frontera política"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Parque Nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Editar límites del parque nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Uso del suelo"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Árbol"
@@ -27640,15 +27583,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Editar árbol"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Nombre botánico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Bosque"
@@ -27657,5 +27600,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Editar bosque"
@@ -27663,17 +27606,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "caducifolio"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "mixto"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Plantación forestal"
@@ -27682,14 +27625,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Editar zona forestal"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Reserva natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Editar reserva natural"
@@ -27697,25 +27640,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Pedregal"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Editar pedregal"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Matorral"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Editar matorral"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Braña"
@@ -27723,10 +27666,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Editar braña"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Brezal o landa"
@@ -27734,5 +27677,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Editar brezal o landa"
@@ -27740,5 +27683,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Edificio agrario"
@@ -27747,45 +27690,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Editar edificio agrario"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Tierra de labranza"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Editar tierra de labranza"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Prado"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Editar prado"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Viñedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Editar viñedo"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Huertos de ocio"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Editar zona de huertos de ocio"
@@ -27793,25 +27736,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Jardín"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Editar jardín"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Pastizal"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Editar pastizal"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27821,10 +27764,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Editar parque municipal"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Espacio de uso común (plazas, alamedas, bulevares, etc.)"
@@ -27832,20 +27775,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Editar espacio de uso común"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Editar parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Área de esparcimiento"
@@ -27853,5 +27796,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Editar área de esparcimiento"
@@ -27859,15 +27802,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Editar suelo residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Camposanto (para los cementerios próximos a las iglesias)"
@@ -27875,9 +27818,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Editar camposanto"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cementerio"
@@ -27885,39 +27828,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Editar cementerio"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Comercios"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Editar comercios"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Oficinas"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Editar oficinas"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Editar suelo industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Zona ferroviaria"
@@ -27925,15 +27868,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Editar zona ferroviaria"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Editar área militar"
@@ -27941,50 +27884,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Zona en construcción"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Editar zona en construcción"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Baldío"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Editar terreno baldío"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Suelo en construcción"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Editar suelo en contrucción"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Vertedero"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Editar vertedero"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Cantera"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Editar cantera"
@@ -27994,5 +27937,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Editar multipolígono"
@@ -28001,10 +27944,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "segmento exterior"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "segmento interior"
@@ -28012,5 +27955,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Restricción de giro"
@@ -28019,5 +27962,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Editar restricción de giro"
@@ -28025,34 +27968,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Restricción"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "prohibido girar a la izquierda"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "prohibido girar a la derecha"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "prohibido continuar recto"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "prohibido giro en U"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "solo giro a la derecha"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "solo giro a la izquierda"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "solo ir recto"
@@ -28061,15 +28004,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "desde la vía"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "a través de nodo o vía"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "a la vía"
@@ -28077,5 +28020,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Ruta"
@@ -28084,5 +28027,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Editar ruta"
@@ -28090,5 +28033,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Tipo de ruta"
@@ -28179,5 +28122,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28187,17 +28130,17 @@
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "carretera"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -28257,5 +28200,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28264,9 +28207,9 @@
 msgstr "pie"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tranvía"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "desvío"
@@ -28280,10 +28223,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Descripción del símbolo"
@@ -28291,31 +28234,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Red"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Ruta estatal"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "Propuesto"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "Suplente"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporal"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "Conexión"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Color (hex)"
@@ -28324,32 +28267,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "segmento de la ruta"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "segmento siguiente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "segmento anterior"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "punto de detención"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "próximo punto de parada"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "anterior punto de parada"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "estándar"
 
 #. mappaint style named "standard"
@@ -32372,4 +32390,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
+
+#~ msgid "Bikes"
+#~ msgstr "Bicicletas"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/et.po
===================================================================
--- /applications/editors/josm/i18n/po/et.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/et.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-07 19:01+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 19:57+0000\n"
 "Last-Translator: lyyser <logard.1961@gmail.com>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1197,5 +1197,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Objekte ei saa maailmast välja viia"
@@ -1508,5 +1508,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2265,9 +2265,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2348,27 +2348,27 @@
 msgstr "Lõpeta joonistamine."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Välja surumine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Alade loomine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Joonista soovitud suurusega ristkülik ning vabasta seejärel hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2386,6 +2386,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2397,9 +2397,9 @@
 msgstr "Vali"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2408,17 +2408,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2428,18 +2428,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
-msgid "Release the mouse button to select the objects in the rectangle."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Pööramise lõpetamiseks vabasta hiire nupp."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3156,5 +3156,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3724,12 +3724,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "ühendus"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -3914,5 +3912,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr ""
@@ -5193,5 +5191,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "kõik"
@@ -5607,4 +5605,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5695,5 +5698,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Seosed"
@@ -5795,9 +5798,9 @@
 msgstr "Valik: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Lase paneel vabaks"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5805,5 +5808,5 @@
 "Sulge see paneel. Te saate selle uuesti avada nupust vasakul tööriistaribal."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Vajuta et minimeerida/maksimeerida paneeli sisu"
@@ -6133,4 +6136,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6143,10 +6152,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6816,145 +6819,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nimi"
@@ -8168,10 +8171,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr ""
@@ -8179,5 +8182,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8191,17 +8193,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "tundmatu"
@@ -8966,11 +8967,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8987,14 +8990,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr ""
@@ -9527,5 +9530,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr ""
@@ -10578,55 +10581,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11099,5 +11102,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr ""
@@ -11119,16 +11122,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr ""
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11158,12 +11162,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr ""
@@ -11859,7 +11863,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "täiendav"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
@@ -14111,6 +14114,7 @@
 msgstr ""
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14201,5 +14205,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14386,5 +14390,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14425,19 +14429,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Ehitised"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14445,5 +14449,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14456,10 +14460,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14642,5 +14646,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16458,5 +16462,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Avalik transport"
@@ -16508,5 +16512,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17077,4 +17081,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "tüüp"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17231,4 +17252,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Pöördekeelud"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Pöördekeelud"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17983,5 +18018,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Hulknurk"
@@ -19251,7 +19286,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19268,5 +19303,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Rajad"
@@ -19284,4 +19319,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19289,9 +19325,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19319,15 +19354,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19338,11 +19367,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Ühesuunaline"
@@ -19362,15 +19390,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19387,11 +19413,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19412,8 +19438,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19431,11 +19457,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19455,6 +19481,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19472,11 +19498,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19496,6 +19522,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19513,11 +19539,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19655,5 +19681,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19662,12 +19688,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19675,13 +19704,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19710,24 +19739,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr ""
@@ -19739,5 +19764,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19751,11 +19776,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19763,10 +19787,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19774,10 +19798,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19785,11 +19809,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19797,10 +19820,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19808,10 +19831,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "mets"
@@ -19819,10 +19842,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19830,11 +19853,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19842,10 +19864,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19853,10 +19875,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19864,10 +19886,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19875,10 +19897,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19886,10 +19908,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -19897,10 +19919,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -19908,10 +19930,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -19992,6 +20014,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -20000,5 +20021,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -20006,6 +20027,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr ""
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr ""
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr ""
@@ -20014,15 +20064,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -20030,5 +20080,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20070,28 +20120,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr ""
@@ -20104,10 +20153,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20121,10 +20170,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20148,97 +20197,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20253,10 +20302,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr ""
@@ -20272,10 +20321,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr ""
@@ -20290,19 +20339,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -20310,20 +20359,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20331,5 +20380,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr ""
@@ -20340,5 +20389,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20358,10 +20407,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20383,10 +20432,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20408,10 +20457,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20433,5 +20482,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20446,9 +20495,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20462,9 +20511,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20494,10 +20543,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20527,5 +20576,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20537,10 +20586,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20548,39 +20597,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Teed"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr ""
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr ""
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr ""
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr ""
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20589,73 +20609,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "matkamine"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr ""
@@ -20664,38 +20652,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "matkamine"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20704,5 +20722,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20710,5 +20728,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20716,5 +20734,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20732,11 +20750,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20744,5 +20762,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20750,5 +20768,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20756,5 +20774,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20763,15 +20781,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
-msgstr ""
-
-#: build/trans_presets.java:600
-msgid "Bikes"
 msgstr ""
 
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr ""
@@ -20781,10 +20795,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr ""
@@ -20792,15 +20806,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr ""
@@ -20808,5 +20822,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -20846,17 +20860,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operaatorfirma"
@@ -20865,5 +20879,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr ""
@@ -20873,5 +20887,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20880,27 +20894,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20908,6 +20922,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20916,11 +20930,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20928,30 +20942,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr ""
@@ -20959,5 +20973,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -20966,14 +20980,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -20981,33 +20995,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21015,5 +21029,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21021,5 +21035,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21030,14 +21044,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21047,5 +21061,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Linnapiiri märk"
@@ -21053,15 +21067,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:690
+msgid "Edit City Limit Sign"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:695
+msgid "Second Name"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:697
-msgid "Edit City Limit Sign"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
-msgid "Second Name"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
 msgid "Speed Camera"
 msgstr ""
@@ -21070,5 +21084,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr ""
@@ -21076,5 +21090,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21082,5 +21096,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21088,5 +21102,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21096,10 +21110,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21107,5 +21121,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr ""
@@ -21113,5 +21127,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -21123,7 +21137,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr ""
@@ -21131,5 +21145,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr ""
@@ -21137,5 +21151,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21143,5 +21157,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21186,16 +21200,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21204,5 +21218,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21210,5 +21224,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21216,10 +21230,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21227,15 +21241,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21243,5 +21257,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21249,10 +21263,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21262,5 +21276,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21271,22 +21285,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21294,5 +21308,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21301,5 +21315,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21311,10 +21325,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21322,5 +21336,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr ""
@@ -21328,50 +21342,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21379,25 +21393,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21408,11 +21422,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr ""
@@ -21420,5 +21434,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr ""
@@ -21426,5 +21440,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21432,10 +21446,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21443,10 +21457,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr ""
@@ -21454,10 +21468,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr ""
@@ -21465,10 +21479,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr ""
@@ -21478,5 +21492,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr ""
@@ -21484,15 +21498,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr ""
@@ -21500,15 +21514,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21516,15 +21530,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21532,5 +21546,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -21539,10 +21553,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21553,14 +21567,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21574,35 +21588,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
 #: build/trans_presets.java:1039
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1041
-msgid "Mud"
-msgstr ""
-
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
 msgid "Beach"
 msgstr ""
@@ -21610,20 +21624,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr ""
@@ -21631,10 +21645,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr ""
@@ -21642,5 +21656,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr ""
@@ -21648,5 +21662,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr ""
@@ -21654,5 +21668,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21661,5 +21675,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21667,10 +21681,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -21678,5 +21692,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21684,5 +21698,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr ""
@@ -21690,15 +21704,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
 #: build/trans_presets.java:1097
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1104
 msgid "Lock Gate"
 msgstr ""
@@ -21707,5 +21721,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21713,20 +21727,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21735,15 +21749,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr ""
@@ -21751,10 +21765,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21762,10 +21776,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21775,20 +21789,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -21796,5 +21810,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -21824,86 +21838,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21915,8 +21854,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21930,29 +21869,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21965,8 +21904,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22037,8 +21976,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22050,8 +21989,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Pinge"
@@ -22064,8 +22003,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22078,23 +22017,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22102,50 +22041,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22153,5 +22092,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22160,10 +22099,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22172,9 +22111,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22183,5 +22122,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22190,5 +22129,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22198,5 +22137,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22204,5 +22143,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22211,5 +22150,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22218,10 +22157,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22229,10 +22168,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22240,10 +22179,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22251,10 +22190,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22262,10 +22201,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22274,5 +22213,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22280,5 +22219,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22287,5 +22226,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22293,5 +22232,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr ""
@@ -22301,62 +22240,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr ""
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22414,32 +22353,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Avatud"
@@ -22498,165 +22437,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22673,5 +22612,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22681,5 +22620,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr ""
@@ -22690,25 +22629,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22717,48 +22656,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
+#: build/trans_presets.java:1362
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1363
+msgid "Spaces for Disabled"
+msgstr ""
+
+#: build/trans_presets.java:1364
+msgid "Spaces for Women"
+msgstr ""
+
+#: build/trans_presets.java:1365
+msgid "Spaces for Parents"
+msgstr ""
+
+#: build/trans_presets.java:1366
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1368
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash"
 #: build/trans_presets.java:1369
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
-msgid "Spaces for Disabled"
-msgstr ""
-
-#: build/trans_presets.java:1371
-msgid "Spaces for Women"
-msgstr ""
-
-#: build/trans_presets.java:1372
-msgid "Spaces for Parents"
-msgstr ""
-
-#: build/trans_presets.java:1373
-msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+msgid "Edit Car Wash"
+msgstr ""
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1374
+msgid "Repair"
+msgstr ""
+
+#. item "Car/Repair"
 #: build/trans_presets.java:1375
-msgid "Wash"
-msgstr ""
-
-#. item "Car/Wash"
-#: build/trans_presets.java:1376
-msgid "Edit Car Wash"
-msgstr ""
-
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
-msgid "Repair"
-msgstr ""
-
-#. item "Car/Repair"
-#: build/trans_presets.java:1382
 msgid "Edit Car Repair"
 msgstr ""
@@ -22766,5 +22705,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr ""
@@ -22773,10 +22712,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22784,5 +22723,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22790,10 +22729,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22802,10 +22741,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22815,5 +22754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22821,5 +22760,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22827,5 +22766,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22833,5 +22772,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22839,5 +22778,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22846,5 +22785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22852,5 +22791,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22859,5 +22798,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22869,5 +22808,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22875,10 +22814,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr ""
@@ -22887,10 +22826,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -22899,5 +22838,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr ""
@@ -22906,5 +22845,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr ""
@@ -22912,5 +22851,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr ""
@@ -22920,5 +22859,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr ""
@@ -22927,6 +22866,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -22934,19 +22873,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -22954,5 +22893,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr ""
@@ -22960,5 +22899,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr ""
@@ -22966,10 +22905,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr ""
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22977,5 +22916,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -22983,10 +22922,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -22995,5 +22934,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23001,5 +22940,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23007,5 +22946,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23013,5 +22952,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23019,5 +22958,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23025,5 +22964,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23033,5 +22972,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23041,5 +22980,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23050,6 +22989,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Tuletorn"
@@ -23059,5 +22998,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23066,5 +23005,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23072,5 +23011,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23078,15 +23017,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Majutus"
@@ -23098,5 +23037,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -23105,15 +23044,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23121,20 +23060,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23142,10 +23081,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23153,30 +23092,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
@@ -23184,10 +23123,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Toit ja jook"
@@ -23198,5 +23137,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restoran"
@@ -23204,5 +23143,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -23210,5 +23149,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23216,73 +23155,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "kohalik"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Kiirtoit"
@@ -23290,17 +23229,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kohvik"
@@ -23308,9 +23247,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pubi"
@@ -23318,18 +23257,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Baar"
@@ -23337,9 +23276,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Ööklubi"
@@ -23347,24 +23286,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Vaatamisväärsus"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Muuseum"
@@ -23372,9 +23311,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Loomaaed"
@@ -23383,9 +23322,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr ""
@@ -23393,24 +23332,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Teemapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr ""
@@ -23418,5 +23357,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -23424,19 +23363,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Infopunkt"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23474,5 +23413,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23480,28 +23419,28 @@
 msgstr "tänav"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23511,5 +23450,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23517,5 +23456,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Matkamine"
@@ -23523,6 +23462,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -23530,5 +23469,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23536,6 +23475,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Suusatamine"
@@ -23543,5 +23482,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23549,46 +23488,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23596,29 +23535,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23626,25 +23565,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Lõkkease"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Piknikuplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr ""
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Ajaloolised kohad"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Loss"
@@ -23653,19 +23592,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Varemed"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr ""
@@ -23674,9 +23613,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr ""
@@ -23684,10 +23623,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23695,5 +23634,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23701,15 +23640,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mälestusmärk"
@@ -23717,55 +23656,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Puhkus"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Veepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Mänguväljak"
@@ -23773,35 +23712,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Kalapüük"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Staadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -23815,6 +23754,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vali spordiala:"
@@ -24206,6 +24145,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24239,225 +24178,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanuu"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "ameerika_jalgpall"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "suusatamine"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "jalgpall"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "lauatennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfiväljak"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Miniatuurne golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr ""
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Mitu"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24496,21 +24435,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tüüp"
@@ -24549,203 +24488,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Kergejõustik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Vibusport"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
+#: build/trans_presets.java:1970
+msgid "Climbing"
+msgstr ""
+
+#. item "Sport/Climbing"
+#: build/trans_presets.java:1971
+msgid "Edit Climbing"
+msgstr ""
+
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
 #: build/trans_presets.java:1977
-msgid "Climbing"
-msgstr ""
-
-#. item "Sport/Climbing"
-#: build/trans_presets.java:1978
-msgid "Edit Climbing"
-msgstr ""
-
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr ""
+
+#. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
-msgid "Dog Racing"
-msgstr ""
-
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
-msgid "Edit Dog Racing"
-msgstr ""
-
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
-msgid "Equestrian"
-msgstr ""
-
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
-msgid "Edit Equestrian"
-msgstr ""
-
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
-msgid "Edit Gymnastics"
-msgstr ""
-
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
 #: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
-msgid "Edit Motor Sports"
-msgstr ""
-
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
-#: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Ujumine"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -24753,52 +24692,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "mägi"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "murdmaa"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "lumepark"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Raskusaste"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "kerge"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Lasketiir"
@@ -24806,177 +24745,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2047
+msgid "Edit Shooting"
+msgstr ""
+
+#: build/trans_presets.java:2053
+msgid "Sport (Ball)"
+msgstr ""
+
+#. group "Sport (Ball)"
 #: build/trans_presets.java:2054
-msgid "Edit Shooting"
-msgstr ""
-
-#: build/trans_presets.java:2060
-msgid "Sport (Ball)"
-msgstr ""
-
-#. group "Sport (Ball)"
-#: build/trans_presets.java:2061
 msgid "Soccer"
 msgstr "Jalgpall"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
+#: build/trans_presets.java:2060
+msgid "Football"
+msgstr ""
+
+#. item "Sport (Ball)/Football"
+#: build/trans_presets.java:2061
+msgid "Edit Football"
+msgstr ""
+
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2067
-msgid "Football"
-msgstr ""
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
-msgid "Edit Football"
-msgstr ""
-
-#: build/trans_presets.java:2073
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Pesapall"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Vali pesapall"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Korvpall"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Vali korvpall"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "Golfiväljak"
 
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2091
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
-#: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Vali kriket"
 
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2109
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
+msgid "Edit Croquet"
+msgstr ""
+
+#: build/trans_presets.java:2120
+msgid "Hockey"
+msgstr ""
+
+#. item "Sport (Ball)/Hockey"
 #: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
-msgid "Edit Croquet"
-msgstr ""
-
+msgid "Edit Hockey"
+msgstr ""
+
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
 #: build/trans_presets.java:2127
-msgid "Hockey"
-msgstr ""
-
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
-msgid "Edit Hockey"
-msgstr ""
-
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragbi"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Vali ragbi"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Laua tennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Vali laua tennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Vali tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Ehirus"
@@ -24984,5 +24923,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Avalik hoone"
@@ -24990,10 +24929,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Raekoda"
@@ -25001,10 +24940,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Vali raekoda"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Saatkond"
@@ -25012,10 +24951,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Vali saatkond"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Kohtumaja"
@@ -25024,10 +24963,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Vali kohtumaja"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vangla"
@@ -25036,10 +24975,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Vali vangla"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politsei"
@@ -25049,10 +24988,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Vali politsei"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Tuletõrjedepoo"
@@ -25061,10 +25000,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Vali tuletõrjedepoo"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -25072,5 +25011,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -25078,15 +25017,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Vali lasteaed"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Kool"
@@ -25094,10 +25033,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Vali kool"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Ülikool"
@@ -25105,10 +25044,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Vali ülikool"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Kolledž"
@@ -25116,5 +25055,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Vali kolledž"
@@ -25122,5 +25061,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -25129,10 +25068,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Vali kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Raamatukogu"
@@ -25141,9 +25080,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Vali raamatukogu"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -25151,10 +25090,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -25163,10 +25102,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Vali teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Palvekoht"
@@ -25176,5 +25115,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Vali palvekoht"
@@ -25183,6 +25122,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religioon"
@@ -25191,66 +25130,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "kristlane"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "juudi"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "moslem"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrism (pärsia)"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Usutunnistus"
@@ -25259,81 +25198,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikaan"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katoliku"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangeelne"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "jehoovatunnistajad"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luterlane"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormoon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoksne"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "nelipühalane"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbüterlane"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestantlik"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "kveeker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "šiia"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Aadressid"
@@ -25342,5 +25281,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Vali aadressi infot"
@@ -25348,5 +25287,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Maja number"
@@ -25354,25 +25293,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Maja nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Linna nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Posti kood"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Riigi kood"
@@ -25381,5 +25320,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25387,61 +25326,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "paaritu"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "paaris"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Inimtekkeline"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Töökojad"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Vali töökojad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Vali torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25449,25 +25388,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Veetorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Vali veetorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gaasimahuti"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Vali gaasimahuti"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Majakas"
@@ -25475,10 +25414,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Vali majakas"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Tuuleveski"
@@ -25486,10 +25425,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Vali tuuleveski"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Torustik"
@@ -25498,41 +25437,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Vali torustik"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gaas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "õli"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -25542,10 +25481,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kraana"
@@ -25553,5 +25492,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Vali kraana"
@@ -25559,10 +25498,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Vali tuletorn"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Geodeetiline punkt"
@@ -25570,10 +25509,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Vali ülevaatlus punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "järelvalve"
@@ -25581,23 +25520,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Vali järelvalve kaamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Elektri generaator"
@@ -25607,35 +25546,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Vali elektri generaator"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "tuul"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hüdro"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fosiil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "tuuma"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "süsi"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "päikeseenergia"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Elektrijaam"
@@ -25644,10 +25583,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Vali elektrijaam"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Elektrialajaam"
@@ -25656,5 +25595,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Vali elektri alajaam"
@@ -25662,10 +25601,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr ""
@@ -25676,23 +25615,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr ""
@@ -25701,74 +25640,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr ""
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Joonetüüp"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "joon"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "üksik"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "topelt"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "kolmekordne"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Teenused"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Tualetid"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Märkus"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -25777,5 +25716,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr ""
@@ -25783,5 +25722,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mündid"
@@ -25789,5 +25728,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Märkused"
@@ -25795,5 +25734,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25801,5 +25740,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Deebetkaart"
@@ -25807,15 +25746,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Krediitkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefoni kaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Jäätmekäitlus"
@@ -25824,5 +25763,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Muuda jäätmekäitlusjaam"
@@ -25830,35 +25769,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Battareid"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr ""
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Riided"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Klaas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Paber"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Vanaraud"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25866,5 +25805,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25873,31 +25812,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Materjal"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "kivi"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastikust"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Värv"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "must"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "pruun"
@@ -25976,5 +25915,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -25984,31 +25923,31 @@
 msgstr "roheala"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "punane"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "sinine"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "hall"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "valge"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Jahikantsel"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Muuda jahiala"
@@ -26017,30 +25956,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Kõrgus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "madal"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "pool"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "täis"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Peida"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lukusta"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Purskaev"
@@ -26049,10 +25988,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Vali purskaev"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Joogi vesi"
@@ -26061,10 +26000,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Vali joogivee asukoht"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26073,5 +26012,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26079,5 +26018,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26085,15 +26024,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Poed"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26101,10 +26040,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26113,28 +26052,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Vali Supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Nurgakauplus"
@@ -26142,9 +26081,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Vali nurgakauplus"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26152,27 +26091,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Vali kiosk"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Lihunik"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Vali lihunik"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Pagar"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Vali pagar"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Lilleseadja"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Vali lilleseadja"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Ökokaubad"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Redigeeri ökopoodi"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Redigeeri alkoholi poode"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Joogipood"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Arvuti"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Vali arvutipood"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektroonika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Vali elektroonika pood"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Mööbel"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Vali mööblipood"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Aiakeskus"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Vali aiakeskus"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Riistvara"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Vali riistvara pood"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Kirjatarbed"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Vali kirjatarvete pood"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Juuksur"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Vali juuksur"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Jalatsid"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Vali jalatsi pood"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Mänguasjad"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Vali mänguasja pood"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Vali video pood"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Kuiir puhastus"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Vali kiirpuhastus"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Pesumaja"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Vali pesumaja"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Välisuks"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Vali välisukse pood"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Vali spordi pood"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Vali optika"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr ""
@@ -26180,5 +26333,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr ""
@@ -26186,306 +26339,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "ühistranspordi_piletid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "ühistranspordi_plaanid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkimis_pilet"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "toit"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "joogid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "maiustused"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "suitsud"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotod"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "looma_toit"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "ajalehed"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "mänguasjad"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "templid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kaardid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefoni_kaardid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "jalgrattaga"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondoomid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampoonid"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Lihunik"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Vali lihunik"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Pagar"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Vali pagar"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Lilleseadja"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Vali lilleseadja"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Ökokaubad"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Redigeeri ökopoodi"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Redigeeri alkoholi poode"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Joogipood"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Arvuti"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Vali arvutipood"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektroonika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Vali elektroonika pood"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Mööbel"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Vali mööblipood"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Aiakeskus"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Vali aiakeskus"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Riistvara"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Vali riistvara pood"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Kirjatarbed"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Vali kirjatarvete pood"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Juuksur"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Vali juuksur"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Jalatsid"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Vali jalatsi pood"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Mänguasjad"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Vali mänguasja pood"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Vali video pood"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Kuiir puhastus"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Vali kiirpuhastus"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Pesumaja"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Vali pesumaja"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Välisuks"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Vali välisukse pood"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Vali spordi pood"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optik"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Vali optika"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Sularaha"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Pank"
@@ -26493,14 +26438,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Vali Pank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Sularaha automaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Raha vahetus"
@@ -26508,5 +26453,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Vali rahavahetus punkt"
@@ -26514,15 +26459,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Vali sularaha automaat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Tervis"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Arstid"
@@ -26530,18 +26475,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Vali arstid"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Hambaarst"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Vali hambaarst"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apteek"
@@ -26549,5 +26494,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Vali Apteek"
@@ -26555,9 +26500,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Retseptuur"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Haigla"
@@ -26565,10 +26510,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Vali haigla"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Hädaabi tugijaam"
@@ -26577,5 +26522,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Vali hädaabi tugijaam"
@@ -26584,20 +26529,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Punkti number"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Punkti nimi"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefoninumber"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26605,5 +26550,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Loomaarst"
@@ -26612,64 +26557,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Vali loomaarst"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geograafia"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Asukohad"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Vali kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Vali maa"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Riik"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Vali riik"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Regioon"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Vali regioon"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Maakond"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Vali maakond"
@@ -26677,15 +26622,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Linn"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Vali linn"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Linn"
@@ -26693,10 +26638,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Muuda linna"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Linnaosa"
@@ -26704,25 +26649,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Muuda linnaosa"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Küla/Alevik/Alev"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Muuda küla/alevik/alev"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Küla"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Muuda küla"
@@ -26730,5 +26675,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Asustamata koht"
@@ -26736,10 +26681,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Muuda asustamata kohta"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Saar"
@@ -26747,10 +26692,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Muuda saart"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26758,5 +26703,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26764,5 +26709,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Koobas"
@@ -26770,10 +26715,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Muuda koobast"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Mäetipp"
@@ -26781,10 +26726,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Muuda mäetippu"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Liustik"
@@ -26792,10 +26737,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Muuda liustikku"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -26803,70 +26748,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Muuda vulkaani"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Piirid"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Riiklikud"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Muuda riiklikke piire"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administratiivpiir"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Muuda administratiivpiire"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Omavalitsus"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Muuda omavalitsuse piire"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Valimisringkond"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Muuda valimisringkonda"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Rahvuspark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Muuda rahvuspargi piire"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Maakasutus"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Üksik puu"
@@ -26875,15 +26820,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Muuda puud"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botaaniline nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Mets"
@@ -26892,5 +26837,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Muuda metsa"
@@ -26898,17 +26843,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "okasmets"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "lehtmets"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "segamets"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Kultuurmets"
@@ -26917,14 +26862,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Muuda kultuurmetsa"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Looduskaitseala"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Muuda looduskaitseala"
@@ -26932,25 +26877,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "klibu, rusukalle"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Muuda rusukallet"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Võsa"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Muuda võsa"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Langus"
@@ -26958,10 +26903,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Muuda langust"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Nõmm"
@@ -26969,5 +26914,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Muuda nõmme"
@@ -26975,5 +26920,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Taluõu"
@@ -26982,45 +26927,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Muuda taluõue"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Talumaa"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Muuda talumaad"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Niit/Karjamaa"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Muuta niitu"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Viinapuuistandus"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Muuda viinapuuistandust"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Eraldised"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Muuda eraldisi"
@@ -27028,25 +26973,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Aed"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Muuda aeda"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Muru"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Muuda muru"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Külatanum"
@@ -27054,10 +26999,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Muuda külatanumat"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Avalik maa"
@@ -27065,20 +27010,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Muuda avalikku maad"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Muuda parki"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Puhkeala"
@@ -27086,5 +27031,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Muuda puhkeala"
@@ -27092,15 +27037,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Elamurajoon"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Muuda elamurajooni"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Matmispaik"
@@ -27108,9 +27053,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Muuda matmispaika"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Kalmistu"
@@ -27118,39 +27063,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Muuda kalmistut"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Kaubandus"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Muuda kaubandust"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Kommerts"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Muuda kommertspiirkonda"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Tööstus"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Muuda tööstuspiirkonda"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Raudtee"
@@ -27158,15 +27103,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Muuda raudteed"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militaarala"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Muuda militaarala"
@@ -27174,50 +27119,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Ehitustanner"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Muuda ehitustandrit"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Jäätmaa"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Muuda jäätmaad"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Roheala"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Muuda roheala"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Prügimägi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Muuda prügimäge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Kivimurd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Muuda kivimurdu"
@@ -27227,5 +27172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Muuda hulknurka"
@@ -27234,10 +27179,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "väline osa"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "siseosa"
@@ -27245,5 +27190,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Pöördekeelud"
@@ -27252,5 +27197,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Muuda pöördekeelde"
@@ -27258,34 +27203,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Keelud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "vasakpöörde keeld"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "parempöörde keeld"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "ei tohi otse sõita"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "ei tohi tagasi pöörata"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "ainult parempööre"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "ainult vaskpööre"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "ainult otsesõit"
@@ -27294,15 +27239,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "teelt"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "üle sõlme või tee"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "teele"
@@ -27310,5 +27255,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Teekond"
@@ -27317,5 +27262,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Muuda teekonda"
@@ -27323,5 +27268,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "teekonna tüüp"
@@ -27412,5 +27357,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27420,17 +27365,17 @@
 msgstr "jalgrattaga"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "tee"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "praam"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "suusad"
@@ -27490,5 +27435,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27497,9 +27442,9 @@
 msgstr "jalgsi"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tramm"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "ümbersõit"
@@ -27513,10 +27458,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metroo"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "sümboolne kirjeldus"
@@ -27524,31 +27469,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Võrk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "planeeritud"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "täiendav"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "ajutine"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "ühendus"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Värv (hex)"
@@ -27557,32 +27502,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "teekonna osa"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "edasisuunaline osa"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "tagasisuunaline osa"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "peatuspunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "edasisuunaline peatuspunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "tagasisuunaline peatuspunkt"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/fi.po
===================================================================
--- /applications/editors/josm/i18n/po/fi.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/fi.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 21:01+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:23+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1199,5 +1199,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Objekteja ei voi siirtää maailman ulkopuolelle"
@@ -1533,5 +1533,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2297,9 +2297,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2383,28 +2383,28 @@
 msgstr "Lopeta piirtäminen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Luo alueita"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 "Siirrä segmenttiä sen normaalin suuntaisesti, sitten vapauta hiirenpainike."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Piirrä halutun kokoinen suorakaide, sen jälkeen vapauta hiiren painike."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2424,6 +2424,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2435,9 +2435,9 @@
 msgstr "Valitse"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Valitse, siirrä ja kierrä objekteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2446,17 +2446,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Siirrä objekteja"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Toteuta siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Kumoa siirto"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2469,9 +2469,9 @@
 "Haluatko varmasti siirtää ne?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Vapauta hiiren painike valitaksesi suorakaiteen sisään jäävät kohteet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2480,9 +2480,9 @@
 "yhdistääksesi lähimpään pisteeseen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Vapauta hiiren painike pyörityksen lopettamiseksi."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3239,5 +3239,5 @@
 msgstr "Toteutetaanko?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3818,12 +3818,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Yhdistetään"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "ei tageja"
+msgstr ""
 
 #. teal
@@ -4004,5 +4002,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "rata"
@@ -5277,5 +5275,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "kaikki"
@@ -5691,4 +5689,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5779,5 +5782,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relaatiot"
@@ -5879,9 +5882,9 @@
 msgstr "Valinta: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Irroita paneeli"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5890,5 +5893,5 @@
 "työkalupalkin napista."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Napsauta pienentääksesi/suurentaaksesi paneelin sisällön"
@@ -6220,4 +6223,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6230,10 +6239,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6903,145 +6906,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nimi"
@@ -8258,10 +8261,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Tyyppi"
@@ -8269,5 +8272,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8281,17 +8283,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "tuntematon"
@@ -9083,11 +9084,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9104,14 +9107,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Taso"
@@ -9662,5 +9665,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Kuvaus"
@@ -10730,55 +10733,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11253,5 +11256,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Auto"
@@ -11273,16 +11276,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Polkupyörä"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11312,12 +11316,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Jalankulku (foot)"
@@ -12023,12 +12027,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Kadunnimi"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Mitatut arvot"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14294,6 +14296,7 @@
 msgstr "Lähetä jäljet"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14384,5 +14387,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Talonumeroiden interpolointilinja"
@@ -14569,5 +14572,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14608,19 +14611,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Rakennukset"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14628,5 +14631,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14639,10 +14642,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14825,5 +14828,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16657,5 +16660,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Julkinen liikenne"
@@ -16707,5 +16710,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17278,4 +17281,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Tyyppi"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17432,4 +17452,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Poista valittu relaatio"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Valitse relaatio"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18190,5 +18224,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19478,7 +19512,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Numero"
@@ -19495,5 +19529,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Kaistat"
@@ -19511,4 +19545,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19516,9 +19551,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Maksiminopeus (km/h)"
@@ -19546,15 +19580,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19565,11 +19593,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Yksisuuntainen"
@@ -19589,15 +19616,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19614,11 +19639,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19639,8 +19664,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19658,11 +19683,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunneli"
@@ -19682,6 +19707,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19699,11 +19724,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Maaleikkaus"
@@ -19723,6 +19748,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19740,11 +19765,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Penger"
@@ -19882,5 +19907,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19889,12 +19914,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19902,13 +19930,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19937,24 +19965,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Pinta"
@@ -19966,5 +19990,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19978,11 +20002,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "päällystetty"
@@ -19990,10 +20013,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "päällystämätön"
@@ -20001,10 +20024,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -20012,11 +20035,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -20024,10 +20046,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -20035,10 +20057,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "metsä"
@@ -20046,10 +20068,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -20057,11 +20079,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "mukulakivi"
@@ -20069,10 +20090,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "sora"
@@ -20080,10 +20101,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -20091,10 +20112,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -20102,10 +20123,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20113,10 +20134,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "ruoho"
@@ -20124,10 +20145,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "hiekka"
@@ -20135,10 +20156,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "maa"
@@ -20219,6 +20240,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Tuntemattoman luokituksen tie"
@@ -20227,5 +20247,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Muokkaa tietä jonka luokitusta ei vielä tiedetä"
@@ -20233,6 +20253,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Rakennettava tie"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Muokkaa rakennettavan tien ominaisuuksia"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Liittymä"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "kiertoliittymä"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Liikennöintirajoitukset"
@@ -20241,15 +20290,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Muokkaa tietä koskevia rajoituksia"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Tietulli"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Umpikuja"
@@ -20257,5 +20306,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Pääsy (access)"
@@ -20297,28 +20346,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "kyllä"
@@ -20331,10 +20379,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20348,10 +20396,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20375,97 +20423,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "ei"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Pakettiautot (goods)"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Raskaat ajoneuvot (3.5 tonnia) (hgv)"
@@ -20480,10 +20528,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Hevonen"
@@ -20499,10 +20547,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Moottoripyörä"
@@ -20517,19 +20565,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Auto"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Julkinen liikenne (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Miniminopeus (km/h)"
@@ -20537,20 +20585,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Maksimipaino (tonnia)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20558,5 +20606,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Kiertoliittymä"
@@ -20567,5 +20615,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Muokkaa kiertoliittymän/risteyksen ominaisuuksia"
@@ -20585,10 +20633,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "moottoritie"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "moottoritien_ramppi"
@@ -20610,10 +20658,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "valtatie"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "valtatien_ramppi"
@@ -20635,10 +20683,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "kantatie"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "kantatien_ramppi"
@@ -20660,5 +20708,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20673,9 +20721,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "yhdystie"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "tie"
@@ -20689,9 +20737,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "asuinkatu"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "pihakatu"
@@ -20721,10 +20769,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20754,5 +20802,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20764,10 +20812,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Muokkaa sillan ominaisuuksia"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20775,39 +20823,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Polut"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Rakennettava tie"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Muokkaa rakennettavan tien ominaisuuksia"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Liittymä"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "kiertoliittymä"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Metsätie (track)"
@@ -20816,73 +20835,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Muokkaa metsätien ominaisuuksia"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Polku"
@@ -20891,38 +20878,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr "Moottorikelkka"
@@ -20931,5 +20948,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20937,5 +20954,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Muokkaa ratsastustien ominaisuuksia"
@@ -20943,5 +20960,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20959,11 +20976,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Muokkaa pyörätietä/kevyen liikenteen väylää"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20971,5 +20988,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20977,5 +20994,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20983,5 +21000,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20990,15 +21007,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Muokkaa jalkakäytävän ominaisuuksia"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Portaat"
@@ -21008,10 +21021,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Muokkaa portaiden ominaisuuksia"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Moottoritien liittymä"
@@ -21019,15 +21032,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Muokkaa moottoritien liittymää"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr ""
@@ -21035,5 +21048,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -21073,17 +21086,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operaattori"
@@ -21092,5 +21105,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Liikennevalot"
@@ -21100,5 +21113,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -21107,27 +21120,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "saari"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -21135,6 +21148,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -21143,11 +21156,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21155,30 +21168,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr ""
@@ -21186,5 +21199,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -21193,14 +21206,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21208,33 +21221,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21242,5 +21255,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21248,5 +21261,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21257,14 +21270,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Kääntöympyrä"
@@ -21274,5 +21287,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr ""
@@ -21280,15 +21293,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:690
+msgid "Edit City Limit Sign"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:695
+msgid "Second Name"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:697
-msgid "Edit City Limit Sign"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
-msgid "Second Name"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
 msgid "Speed Camera"
 msgstr "Nopeuskamera"
@@ -21297,5 +21310,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Hätäpuhelin"
@@ -21303,5 +21316,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21309,5 +21322,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21315,5 +21328,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21323,10 +21336,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Kahluupaikka"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21334,5 +21347,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr ""
@@ -21340,5 +21353,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -21350,7 +21363,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr ""
@@ -21358,5 +21371,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Esteet"
@@ -21364,5 +21377,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21370,5 +21383,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21413,16 +21426,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Sallitut kulkumuodot:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21431,5 +21444,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21437,5 +21450,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21443,10 +21456,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21454,15 +21467,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21470,5 +21483,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21476,10 +21489,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21489,5 +21502,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Pensasaita"
@@ -21498,22 +21511,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Aita"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Muuri"
@@ -21521,5 +21534,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Kaupunginmuuri"
@@ -21528,5 +21541,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21538,10 +21551,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21549,5 +21562,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Portti"
@@ -21555,50 +21568,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21606,25 +21619,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21635,11 +21648,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vesi"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Lähde"
@@ -21647,5 +21660,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Muokkaa lähteen ominaisuuksia"
@@ -21653,5 +21666,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21659,10 +21672,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21670,10 +21683,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr ""
@@ -21681,10 +21694,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanava"
@@ -21692,10 +21705,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Joki"
@@ -21705,5 +21718,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Muokkaa joen ominaisuuksia"
@@ -21711,15 +21724,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Muokkaa veden ominaisuuksia"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Maa"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Muokkaa maan ominaisuuksia"
@@ -21727,15 +21740,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Tekojärvi"
@@ -21743,15 +21756,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Muokkaa tekojärven ominaisuuksia"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21759,5 +21772,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Joentörmä"
@@ -21766,10 +21779,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Muokkaa joentörmän ominaisuuksia"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Kosteikko"
@@ -21780,14 +21793,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Muokkaa kosteikon ominaisuuksia"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "suo"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "räme"
@@ -21801,35 +21814,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "suo"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Muta"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Muokkaa mudan ominaisuuksia"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Ranta"
@@ -21837,20 +21850,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Muokkaa rannan ominaisuuksia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Lahti"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Muokkaa lahden ominaisuuksia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Kallio"
@@ -21858,10 +21871,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Muokkaa kallion ominaisuuksia"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Rantaviiva"
@@ -21869,5 +21882,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Muokkaa rantaviivan ominaisuuksia"
@@ -21875,5 +21888,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Lauttareitti"
@@ -21881,5 +21894,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21888,5 +21901,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21894,10 +21907,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Telakka"
@@ -21905,5 +21918,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21911,5 +21924,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Pato"
@@ -21917,15 +21930,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
 #: build/trans_presets.java:1097
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1104
 msgid "Lock Gate"
 msgstr "Sulkuportti"
@@ -21934,5 +21947,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21940,20 +21953,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Vesiputous"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Muokkaa vesiputouksen ominaisuuksia"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21962,15 +21975,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Venesatama"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Laituri"
@@ -21978,10 +21991,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Muokkaa laiturin ominaisuuksia"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Lauttaterminaali"
@@ -21989,10 +22002,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Muokkaa lauttaterminaalin ominaisuuksia"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -22002,20 +22015,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr "Rata"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Rata"
@@ -22023,5 +22036,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -22051,86 +22064,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22142,8 +22080,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22157,29 +22095,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "sivuraide"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22192,8 +22130,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22264,8 +22202,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22277,8 +22215,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Jännite"
@@ -22291,8 +22229,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22305,23 +22243,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Kapean raideleveyden rata"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Muokkaa kapean raideleveyden rataa"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22329,50 +22267,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Säilytetty"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Muokkaa museroradan ominaisuuksia"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Pikaraitiotie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Muokkaa metron ominaisuuksia"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Raitiotie"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22380,5 +22318,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22387,10 +22325,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Käytöstä poistettu rata"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Muokkaa käytöstä poistetun radan ominaisuuksia"
@@ -22399,9 +22337,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Purettu rata"
@@ -22410,5 +22348,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Tasoristeys"
@@ -22417,5 +22355,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Risteys"
@@ -22425,5 +22363,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22431,5 +22369,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Kääntöpöytä"
@@ -22438,5 +22376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22445,10 +22383,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Köysiradat"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Tuolihissi"
@@ -22456,10 +22394,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Hiihtohissi"
@@ -22467,10 +22405,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Muokkaa hiihtohissin ominaisuuksia"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Köysirata"
@@ -22478,10 +22416,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Muokkaa köysiradan ominaisuuksia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22489,10 +22427,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22501,5 +22439,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22507,5 +22445,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22514,5 +22452,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22520,5 +22458,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Polttoaine"
@@ -22528,62 +22466,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Muokkaa huoltoaseman ominaisuuksia"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22641,32 +22579,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Aukioloajat"
@@ -22725,165 +22663,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22900,5 +22838,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22908,5 +22846,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Muokkaa pysäköinnin ominaisuuksia"
@@ -22917,25 +22855,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "monikerroksinen"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "maanalainen"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22944,48 +22882,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Maksu"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Invapaikkojen lukumäärä"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Autopesula"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Muokkaa autopesulan ominaisuuksia"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Korjaamo"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Muokkaa autokorjaamon ominaisuuksia"
@@ -22993,5 +22931,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Vuokraamo"
@@ -23000,10 +22938,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Muokkaa autovuokraamon ominaisuuksia"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -23011,5 +22949,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -23017,10 +22955,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Muokkaa pyörätelineen ominaisuuksia"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Paikkojen lukumäärä"
@@ -23029,10 +22967,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Muokkaa polkupyörävuokraamon ominaisuuksia"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23042,5 +22980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23048,5 +22986,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -23054,5 +22992,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Rautatien seisake"
@@ -23060,5 +22998,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Muokkaa rautatien seisaketta"
@@ -23066,5 +23004,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Raitiovaunupysäkki"
@@ -23073,5 +23011,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Muokkaa raitiovaunupysäkkiä"
@@ -23079,5 +23017,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Asemalaituri"
@@ -23086,5 +23024,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Muokkaa laiturin asetuksia"
@@ -23096,5 +23034,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -23102,10 +23040,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Alue"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Metron sisäänkäynti"
@@ -23114,10 +23052,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Muokkaa sisäänkäynnin ominaisuuksia"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Pyörätuoli"
@@ -23126,5 +23064,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Linja-autoasema"
@@ -23133,5 +23071,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Muokkaa linja-autoaseman ominaisuuksia"
@@ -23139,5 +23077,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Linja-autopysäkki"
@@ -23147,5 +23085,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Muokkaa linja-autopysäkin ominaisuuksia"
@@ -23154,6 +23092,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -23161,19 +23099,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Penkki"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -23181,5 +23119,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taksi"
@@ -23187,5 +23125,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Muokkaa taksitolppaa"
@@ -23193,10 +23131,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Lentokenttä"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23204,5 +23142,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23210,10 +23148,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23222,5 +23160,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23228,5 +23166,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23234,5 +23172,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23240,5 +23178,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23246,5 +23184,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23252,5 +23190,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23260,5 +23198,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23268,5 +23206,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23277,6 +23215,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Loisto"
@@ -23286,5 +23224,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23293,5 +23231,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23299,5 +23237,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23305,15 +23243,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Majoittuminen"
@@ -23325,5 +23263,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotelli"
@@ -23332,15 +23270,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Muokkaa hotellia"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Tähdet"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motelli"
@@ -23348,20 +23286,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Muokkaa motellin ominaisuuksia"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Vierasmaja"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Muokkaa vierasmajan ominaisuuksia"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Alppimaja"
@@ -23369,10 +23307,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostelli"
@@ -23380,30 +23318,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Matkailuvaunualue"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Muokkaa matkailuvaunualueen ominaisuuksia"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Leirintäalue"
@@ -23411,10 +23349,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Ruoka ja juoma"
@@ -23425,5 +23363,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ravintola"
@@ -23431,5 +23369,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Muokkaa ravintolan ominaisuuksia"
@@ -23437,5 +23375,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23443,73 +23381,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italialainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "kiinalainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hampurilainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "kreikkalainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "saksalainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "intialainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "paikallinen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turkkilainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "aasialainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thaimaalainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "meksikolainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanilainen"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Pikaruoka"
@@ -23517,17 +23455,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Muokkaa pikaruokalan ominaisuuksia"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kahvila"
@@ -23535,9 +23473,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Muokkaa kahvilan ominaisuuksia"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr ""
@@ -23545,18 +23483,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23564,9 +23502,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Yökerho"
@@ -23574,24 +23512,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Muokkaa yökerhon ominaisuuksia"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turismi"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Nähtävyys"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museo"
@@ -23599,9 +23537,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Muokkaa museon ominaisuuksia"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Eläintarha"
@@ -23610,9 +23548,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Muokkaa eläintarhan ominaisuuksia"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Näköalapaikka"
@@ -23620,24 +23558,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Muokkaa näköalapaikan ominaisuuksia"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Teemapuisto"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Taideteos"
@@ -23645,5 +23583,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -23651,19 +23589,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Kartta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23701,5 +23639,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23707,28 +23645,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23738,5 +23676,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23744,5 +23682,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23750,6 +23688,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Pyöräily"
@@ -23757,5 +23695,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23763,6 +23701,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -23770,5 +23708,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23776,46 +23714,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "historia"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23823,29 +23761,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23853,25 +23791,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Piknik-paikka"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Muokkaa piknik-paikan ominaisuuksia"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historialliset paikat"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Linna"
@@ -23880,19 +23818,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Muokkaa linnan ominaisuuksia"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Rauniot"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Muokkaa raunioiden ominaisuuksia"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Arkeologinen kaivaus"
@@ -23901,9 +23839,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Taistelukenttä"
@@ -23911,10 +23849,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23922,5 +23860,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23928,15 +23866,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumentti"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Muistomerkki"
@@ -23944,55 +23882,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Vapaa-ajanviete"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vesipuisto"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Muokkaa vesipuiston ominaisuuksia"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Leikkipuisto"
@@ -24000,35 +23938,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Muokkaa leikkipuiston ominaisuuksia"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Kalastus"
 
 #. item "Leisure/Fishing"
+#: build/trans_presets.java:1888
+msgid "Edit Fishing"
+msgstr ""
+
+#. item "Leisure/Fishing" text "Name"
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
 #: build/trans_presets.java:1895
-msgid "Edit Fishing"
-msgstr ""
-
-#. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
-msgid "Sports"
-msgstr ""
-
-#. group "Sports"
-#: build/trans_presets.java:1902
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Muokkaa stadionin ominaisuuksia"
@@ -24042,6 +23980,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Valitse urheilulaji:"
@@ -24433,6 +24371,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24466,225 +24404,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "jousiammunta"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australialainen jalkapallo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "koripallo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "kuulapelit"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "kiipeily"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriketti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "krikettiverkko"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "kroketti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "pyöräily"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ratsastus"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "amerikkalainen jalkapallo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "voimistelu"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "jääkiekko"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "ammunta"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "jalkapallo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "uinti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "pöytätennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Urheilukeskus"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Muokkaa urheilukeskuksen ominaisuuksia"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Kenttä"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Muokkaa kentän ominaisuuksia"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Kilparata"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Muokkaa kilparadan ominaisuuksia"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfkenttä"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Muokkaa golf-kentän ominaisuuksia"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Pienoisgolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Muokkaa minigolfin ominaisuuksia"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Urheilu"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24723,21 +24661,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tyyppi"
@@ -24776,203 +24714,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "kenttä"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "urheilukeskus"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Jousiammunta"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Kiipeily"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr ""
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ratsastus"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr ""
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Voimistelu"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Moottoriurheilu"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Muokkaa moottoriurheilun ominaisuuksia"
 
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
+#: build/trans_presets.java:2019
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
-#: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Unti"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -24980,52 +24918,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:2038
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:2041
+msgid "Piste type"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2041
+msgid "downhill"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "nordic"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "snow_park"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2042
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:2045
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
-msgid "Piste type"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
-msgid "downhill"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "nordic"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "snow_park"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "advanced"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:2052
 msgid "Shooting"
 msgstr "Ammunta"
@@ -25033,177 +24971,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Pallopelit"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Jalkapallo"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikkalainen jalkapallo"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australialainen jalkapallo"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Koripallo"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfkenttä"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Kuulapeli"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Muokkaa kuulapelin ominaisuuksia"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriketti"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Muokkaa kriketin ominaisuuksia"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Krikettiverkko"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Muokkaa krikettiverkon ominaisuuksia"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroketti"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Jääkiekko"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Muokkaa jääkiekkopaikan ominaisuuksia"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Pöytätennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr ""
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
+#: build/trans_presets.java:2151
+msgid "Edit Tennis"
+msgstr ""
+
 #: build/trans_presets.java:2158
-msgid "Edit Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2165
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Rakennus"
@@ -25211,5 +25149,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Julkinen rakennus"
@@ -25217,10 +25155,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Muokkaa julkisen rakennuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Kaupungintalo"
@@ -25228,10 +25166,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Muokkaa kaupungintalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Suurlähetystö"
@@ -25239,10 +25177,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Muokkaa suurlähetystön ominaisuuksia"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Oikeustalo"
@@ -25251,10 +25189,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Muokkaa oikeustalon ominaisuuksia"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vankila"
@@ -25263,10 +25201,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Muokkaa vankilan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Poliisiasema"
@@ -25276,10 +25214,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Muokkaa poliisiaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Paloasema"
@@ -25288,10 +25226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Muokkaa paloaseman ominaisuuksia"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postitoimisto"
@@ -25299,5 +25237,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Muokkaa postitoimiston ominaisuuksia"
@@ -25305,15 +25243,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Lastentarha"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Muokkaa lastentarhan ominaisuuksia"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Koulu"
@@ -25321,10 +25259,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Muokkaa koulun ominaisuuksia"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Yliopisto"
@@ -25332,10 +25270,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Muokkaa yliopiston ominaisuuksia"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Korkeakoulu"
@@ -25343,5 +25281,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Muokkaa korkeakoulun ominaisuuksia"
@@ -25349,5 +25287,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Elokuvateatteri"
@@ -25356,10 +25294,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Muokkaa elokuvateatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Kirjasto"
@@ -25368,9 +25306,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Muokkaa kirjaston ominaisuuksia"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Taidekeskus"
@@ -25378,10 +25316,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Muokkaa taidekeskuksen ominaisuuksia"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatteri"
@@ -25390,10 +25328,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Muokkaa teatterin ominaisuuksia"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -25403,5 +25341,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -25410,6 +25348,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Uskonto"
@@ -25418,66 +25356,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25486,81 +25424,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Osoitteet"
@@ -25569,5 +25507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Muokkaa osoitetietoja"
@@ -25575,5 +25513,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Talon numero"
@@ -25581,25 +25519,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Talon nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Kadunnimi"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Kaupungin nimi"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postinumero"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Maakoodi"
@@ -25608,5 +25546,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Muokkaa interpolointilinjaa"
@@ -25614,61 +25552,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "pariton"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "parillinen"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Tehdas"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Muokkaa tehtaan ominaisuuksia"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torni"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Muokkaa tornin ominaisuuksia"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25676,25 +25614,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vesitorni"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Muokkaa vesitornin ominaisuuksia"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Kaasukello"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Muokkaa kaasukellon ominaisuuksia"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Majakka"
@@ -25702,10 +25640,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Muokkaa majakan ominaisuuksia"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Tuulimylly"
@@ -25713,10 +25651,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Muokkaa tuulimyllyn ominaisuuksia"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Putki"
@@ -25725,41 +25663,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Muokkaa putken ominaisuuksia"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "kaasu"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Vedenpuhdistuslaitos"
@@ -25769,10 +25707,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Muokkaa vedenpuhdistuslaitoksen ominaisuuksia"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Nosturi"
@@ -25780,5 +25718,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Muokkaa nosturin ominaisuuksia"
@@ -25786,10 +25724,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25797,10 +25735,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Valvontakamera"
@@ -25808,23 +25746,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Muokkaa valvontakameran ominaisuuksia"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr ""
@@ -25834,35 +25772,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "tuuli"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vesivoima"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossiilinen polttoaine"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "ydinvoima"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kivihiili"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr ""
@@ -25871,10 +25809,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Muuntamoasema"
@@ -25883,5 +25821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Muokkaa muuntamoaseman ominaisuuksia"
@@ -25889,10 +25827,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Korkeajännitelinjan torni"
@@ -25903,23 +25841,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Muokkaa korkeajännitelinjan tornin ominaisuuksia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Sähkölinja"
@@ -25928,74 +25866,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Muokkaa sähkölinjan ominaisuuksia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Käymälä"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Postilaatikko"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Puhelin"
@@ -26004,5 +25942,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Muokkaa puhelimen ominaisuuksia"
@@ -26010,5 +25948,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Kolikot"
@@ -26016,5 +25954,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr ""
@@ -26022,5 +25960,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -26028,5 +25966,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -26034,15 +25972,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Luottokortit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Puhelinkortit"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Kierrätys"
@@ -26051,5 +25989,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Muokkaa kierrätyspisteen ominaisuuksia"
@@ -26057,35 +25995,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Paristot"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Peltitölkit"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Vaatteet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Lasi"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Paperi"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Romumetalli"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26093,5 +26031,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26100,31 +26038,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26203,5 +26141,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26211,31 +26149,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Metsästyslava"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Muokkaa metsästyslavan ominaisuuksia"
@@ -26244,30 +26182,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Korkeus"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "täysi"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Lähde"
@@ -26276,10 +26214,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Muokkaa lähteen ominaisuuksia"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Juomavesi"
@@ -26288,10 +26226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Muokkaa juomaveden ominaisuuksia"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26300,5 +26238,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26306,5 +26244,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26312,15 +26250,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Kaupat"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26328,10 +26266,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Muokkaa autokaupan ominaisuuksia"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26340,28 +26278,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Pyöräkauppa"
 
 #. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr ""
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
 #: build/trans_presets.java:2545
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2551
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2552
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Lähikauppa"
@@ -26369,9 +26307,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Muokkaa lähikaupan tietoja"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kioski"
@@ -26379,27 +26317,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Muokkaa kioskin ominaisuuksia"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Lihakauppa"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Muokkaa lihakaupan ominaisuuksia"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Leipomo"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Muokkaa leipomon ominaisuuksia"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Luomukauppa"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Muokkaa luomukaupan ominaisuuksia"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Tee-se-itse-kauppa"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Kampaamo"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Muokkaa kampaamon ominaisuuksia"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Kuivapesula"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Muokkaa kuivapesulan ominaisuuksia"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Pesula"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Muokkaa pesulan ominaisuuksia"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Muokkaa optikon ominaisuuksia"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Automaatti"
@@ -26407,5 +26559,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Muokkaa automaatin tietoja"
@@ -26413,306 +26565,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Automaatin tuotteet"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "juomat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "polkupyörä"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Lihakauppa"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Muokkaa lihakaupan ominaisuuksia"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Leipomo"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Muokkaa leipomon ominaisuuksia"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Luomukauppa"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Muokkaa luomukaupan ominaisuuksia"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Tee-se-itse-kauppa"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Muokkaa tee-se-itse-kaupan ominaisuuksia"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Kampaamo"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Muokkaa kampaamon ominaisuuksia"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Kuivapesula"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Muokkaa kuivapesulan ominaisuuksia"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Pesula"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Muokkaa pesulan ominaisuuksia"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Muokkaa optikon ominaisuuksia"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Raha"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Pankki"
@@ -26720,14 +26664,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Muokkaa pankin ominaisuuksia"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Pankkiautomaatti"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Rahanvaihto"
@@ -26735,5 +26679,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Muokkaa rahanvaihdon ominaisuuksia"
@@ -26741,15 +26685,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Muokkaa pankkiautomaatin ominaisuuksia"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Terveys"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Lääkäri"
@@ -26757,18 +26701,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Muokkaa lääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Hammaslääkäri"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Muokkaa hammaslääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apteekki"
@@ -26776,5 +26720,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Muokkaa apteekin ominaisuuksia"
@@ -26782,9 +26726,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Sairaala"
@@ -26792,10 +26736,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Muokkaa sairaalan ominaisuuksia"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26804,5 +26748,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26811,20 +26755,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Puhelinnumero"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26832,5 +26776,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Eläinlääkäri"
@@ -26839,64 +26783,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Muokkaa eläinlääkärin ominaisuuksia"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Paikat"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Maanosa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Muokkaa maanosan ominaisuuksia"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Maa"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Muokkaa maan ominaisuuksia"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Osavaltio"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Muokkaa osavaltion ominaisuuksia"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Seutu"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr ""
@@ -26904,15 +26848,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Iso kaupunki"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Kaupunki"
@@ -26920,10 +26864,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Muokkaa kaupungin ominaisuuksia"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Kaupunginosa"
@@ -26931,25 +26875,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Muokkaa kaupunginosan ominaisuuksia"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Kunta"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Muokkaa kunnan ominaisuuksia"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Kylä"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Muokkaa kylän ominaisuuksia"
@@ -26957,5 +26901,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26963,10 +26907,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Saari"
@@ -26974,10 +26918,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Muokkaa saaren ominaisuuksia"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26985,5 +26929,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26991,5 +26935,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Luolan suuaukko"
@@ -26997,10 +26941,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Muokkaa luolan suuaukon ominaisuuksia"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Huippu"
@@ -27008,10 +26952,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Muokkaa huipun ominaisuuksia"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Jäätikkö"
@@ -27019,10 +26963,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Muokkaa jäätikön ominaisuuksia"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Tulivuori"
@@ -27030,70 +26974,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Muokkaa tulivuoren ominaisuuksia"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Rajat"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Kansallinen"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Muokkaa kansallisen rajan ominaisuuksia"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Hallinnollinen"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Muokkaa hallinnollisen rajan ominaisuuksia"
 
 #. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2946
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
 msgid "Edit Political Boundary"
 msgstr "Muokkaa poliittisen rajan ominaisuuksia"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Muokkaa kansallispuiston rajan ominaisuuksia"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Maankäyttö"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Puu"
@@ -27102,15 +27046,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Muokkaa puun ominaisuuksia"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Kasvitieteellinen nimi"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Metsä"
@@ -27119,5 +27063,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Muokkaa metsän ominaisuuksia"
@@ -27125,17 +27069,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "havumetsä"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "lehtimetsä"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "sekametsä"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Talousmetsä"
@@ -27144,14 +27088,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Muokkaa talousmetsän ominaisuuksia"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Luonnonsuojelualue"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -27159,25 +27103,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Kivikko, rakka"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Muokkaa kivikon ominaisuuksia"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Pusikko"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Muokkaa pusikon ominaisuuksia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Tunturi"
@@ -27185,10 +27129,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Muokkaa tunturin ominaisuuksia"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Nummi"
@@ -27196,5 +27140,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Muokkaa nummen ominaisuuksia"
@@ -27202,5 +27146,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Maatilan piha/työskentelyalue (muu kuin pelto)"
@@ -27209,45 +27153,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Muokkaa maatilan pihan ominaisuuksia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Peltoalueet"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Viinitarha"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Muokkaa viinitarhan ominaisuuksia"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Siirtolapuutarha"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Muokkaa siirtolapuutarhan ominaisuuksia"
@@ -27255,25 +27199,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Puutarha"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Ruoho"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Muokkaa ruohon ominaisuuksia"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27281,10 +27225,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27292,20 +27236,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Puisto"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Muokkaa puiston ominaisuuksia"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27313,5 +27257,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27319,15 +27263,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Asuinalue"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Muokkaa asuinalueen ominaisuuksia"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Hautausmaa (pieni)"
@@ -27335,9 +27279,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Muokkaa pienen hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Hautausmaa"
@@ -27345,39 +27289,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Muokkaa hautausmaan ominaisuuksia"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Kaupallinen"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Muokkaa kaupallisen alueen ominaisuuksia"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Toimistoalue"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Muokkaa toimistoalueen ominaisuuksia"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Teollisuusalue"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Muokkaa teollisuusalueen ominaisuuksia"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Rata-alue"
@@ -27385,15 +27329,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Muokkaa rata-alueen ominaisuuksia"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Sotilasvoimat"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Muokkaa sotilasvoimien maa-alueen ominaisuuksia"
@@ -27401,50 +27345,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Rakennustyömaa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Muokkaa rakennustyömaan ominaisuuksia"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Purettuja rakennuksia"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Muokkaa purettujen rakennusten alueen ominaisuuksia"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Rakentamiselle raivattu alue"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Muokkaa rakentamiselle raivatun alueen ominaisuuksia"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Kaatopaikka"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Muokkaa kaatopaikan ominaisuuksia"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Louhos"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Muokkaa louhoksen ominaisuuksia"
@@ -27454,5 +27398,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27461,10 +27405,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27472,5 +27416,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27479,5 +27423,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27485,34 +27429,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Kielto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27521,15 +27465,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27537,5 +27481,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27544,5 +27488,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27550,5 +27494,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27639,5 +27583,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27647,17 +27591,17 @@
 msgstr "polkupyörä"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27717,5 +27661,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27724,9 +27668,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27740,10 +27684,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27751,31 +27695,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27784,31 +27728,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/fr.po
===================================================================
--- /applications/editors/josm/i18n/po/fr.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/fr.po	(revision 20945)
@@ -6,7 +6,7 @@
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-12 20:35+0000\n"
-"Last-Translator: HB9DTX <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:39+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Fr <>\n"
 "MIME-Version: 1.0\n"
@@ -14,5 +14,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Language: French\n"
@@ -65,5 +65,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1210,5 +1210,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Impossible de déplacer des objets en dehors du monde."
@@ -1549,5 +1549,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2327,9 +2327,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2413,18 +2413,18 @@
 msgstr "Terminer le chemin."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extruder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Créer des surfaces"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extruder un chemin"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
@@ -2432,5 +2432,5 @@
 "souris."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -2438,5 +2438,5 @@
 "souris."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2458,6 +2458,6 @@
 "Maj+relâchement pour synchroniser la piste audio sur ce point."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2469,9 +2469,9 @@
 msgstr "Sélectionner"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Sélectionner, déplacer et faire pivoter des objets"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2480,17 +2480,17 @@
 msgstr[1] "Ajouter et déplacer un nouveau nœud virtuel aux {0} chemins."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Déplacer des éléments"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Les déplacer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Annuler le déplacement"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2503,5 +2503,5 @@
 "Confirmez-vous ce déplacement massif ?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2509,5 +2509,5 @@
 "rectangle."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2516,9 +2516,9 @@
 "fusionner avec le nœud le plus proche."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Relacher le bouton de souris pour arrêter la rotation."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3299,5 +3299,5 @@
 msgstr "Appliquer ?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3922,17 +3922,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "connexion"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Etiqueté"
+msgstr ""
 
 #. teal
@@ -4117,5 +4114,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "voie ferrée"
@@ -5478,5 +5475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "all"
@@ -5925,4 +5922,9 @@
 msgstr "Mode filtre"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -6013,5 +6015,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relations"
@@ -6113,14 +6115,14 @@
 msgstr "Sélection : {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Détacher le panneau"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Fermer le panneau (vous pouvez le rouvrir depuis la barre d’outils)"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Réduire/Agrandir le panneau"
@@ -6467,4 +6469,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6477,10 +6485,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7150,145 +7152,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nom"
@@ -8604,10 +8606,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Type"
@@ -8615,5 +8617,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8627,17 +8628,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "inconnue"
@@ -9522,11 +9522,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9543,14 +9545,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Calque"
@@ -10148,5 +10150,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Description"
@@ -11310,26 +11312,26 @@
 msgstr "Fermer la fenêtre et accepter l’autorisation d’accès"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Attention : impossible d’interrompre le processus OAuth"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Récupération de la requête d’autorisation OAuth depuis ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Récupération de l’autorisation d’accès depuis ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "Le site OSM n’a pas retourné une session cookie en réponse à ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11338,29 +11340,29 @@
 "a échouée"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "L’autorisation de la requête OAuth ''{0}'' a échoué"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Demande de requête d’autorisation OAuth ''{0}'' au site OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Initialisation d’une session sur le site OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Identification de la session pour l’utilisateur ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Autorisation de la requête d’accès ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11899,5 +11901,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Voiture"
@@ -11919,16 +11921,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Vélo"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11958,12 +11961,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Piéton"
@@ -12705,17 +12708,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Paramètres avancés OAuth"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nom de la rue"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Valeurs mesurées"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -15306,6 +15306,7 @@
 msgstr "Envoyer les traces"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibilité"
@@ -15399,5 +15400,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolation d’adresse"
@@ -15592,5 +15593,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Créer un bâtiment"
@@ -15631,19 +15632,19 @@
 msgstr "Définir la largeur des bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr "Télécharger les bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Extraire le bâtiment en un clic (images vectorielles uniquement)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bâtiments"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15653,5 +15654,5 @@
 "Calques des bâtiments et un calque OSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15667,10 +15668,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Sélectionner la feuille cadastrale."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15714,7 +15715,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Fichier tampon de la zone Lambert 2 (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15869,5 +15869,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17786,5 +17786,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Transport public"
@@ -17836,5 +17836,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Points"
@@ -18414,4 +18414,23 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Type"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "De:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+#, fuzzy
+msgid "To:"
+msgstr "A:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
 msgstr ""
 
@@ -18595,4 +18614,18 @@
 msgstr "Ceux qui participent déjà à un conflit"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Supprimer de l’interdiction de tourner"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Supprimer de l’interdiction de tourner"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -19372,5 +19405,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygone"
@@ -20747,7 +20780,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Référence"
@@ -20764,5 +20797,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Nombre de voies"
@@ -20780,4 +20813,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20785,9 +20819,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Vitesse max. (km/h)"
@@ -20815,15 +20848,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20834,11 +20861,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Sens unique"
@@ -20858,15 +20884,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20883,11 +20907,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20908,8 +20932,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20927,11 +20951,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -20951,6 +20975,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20968,11 +20992,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Tranchée"
@@ -20992,6 +21016,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -21009,11 +21033,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Remblai"
@@ -21151,5 +21175,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Aires de croisement"
@@ -21158,12 +21182,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -21171,13 +21198,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Largeur (mètres)"
@@ -21206,24 +21233,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Revêtement"
@@ -21235,5 +21258,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -21247,11 +21270,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "avec revêtement"
@@ -21259,10 +21281,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "sans revêtement"
@@ -21270,10 +21292,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asphalte"
@@ -21281,11 +21303,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "béton"
@@ -21293,10 +21314,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "métal"
@@ -21304,10 +21325,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "bois"
@@ -21315,10 +21336,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "pavés"
@@ -21326,11 +21347,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "galets"
@@ -21338,10 +21358,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "gravier"
@@ -21349,10 +21369,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "galets"
@@ -21360,10 +21380,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "compact"
@@ -21371,10 +21391,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "gazon"
@@ -21382,10 +21402,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "herbe"
@@ -21393,10 +21413,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sable"
@@ -21404,10 +21424,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "terre"
@@ -21488,6 +21508,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Route (type inconnu)"
@@ -21496,5 +21515,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Modifier une route (type inconnu)"
@@ -21502,6 +21521,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Chemin en construction"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Modifier une route en construction"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Carrefour"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rond-point"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Rue à accès restreint"
@@ -21510,15 +21558,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Modifier les restrictions d’une route"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Péage"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Sans issue"
@@ -21526,5 +21574,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Accès"
@@ -21566,28 +21614,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "oui"
@@ -21600,10 +21647,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21617,10 +21664,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21644,97 +21691,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "autorisé"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "véhicules agricoles"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "sylviculture"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "livraison"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "non"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Agricole"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "désigné"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "officiel"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Transport de marchandises"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Poids-lourds"
@@ -21749,10 +21796,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Chevaux"
@@ -21768,10 +21815,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motos"
@@ -21786,19 +21833,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Voitures"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport public"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Vitesse min. (km/h)"
@@ -21806,20 +21853,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Poids max. (tonnes)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Hauteur maximale (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Largeur maximale (mètres)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Longueur maximale (mètres)"
@@ -21827,5 +21874,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rond-point"
@@ -21836,5 +21883,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Modifier un carrefour"
@@ -21854,10 +21901,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autoroute"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "bretelle d’accès à une autoroute"
@@ -21879,10 +21926,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "voie rapide"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "bretelle d’accès à une voie rapide"
@@ -21904,10 +21951,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "route primaire"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "bretelle d’accès à une route primaire"
@@ -21929,5 +21976,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21942,9 +21989,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "route tertiaire"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "mineure"
@@ -21958,9 +22005,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "rue résidentiel"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "living_street"
@@ -21990,10 +22037,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "voie d’accès"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "voie réservée aux bus guidés"
@@ -22023,5 +22070,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -22033,10 +22080,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Modifier un pont"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Modifier un tunnel"
@@ -22044,39 +22091,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Chemins"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Chemin en construction"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Modifier une route en construction"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Carrefour"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rond-point"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Piste"
@@ -22085,73 +22103,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Modifier une piste"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Type de revêtement"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "catégorie 1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "catégorie 2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "catégorie 3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "catégorie 4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "catégorie 5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "Niveau de difficulté VTT"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "Échelle CAS (classification du Club Alpin Suisse)"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "randonnée"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "randonnée en montagne"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "randonnée en montagne exigeante"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "randonnée alpine"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "randonnée alpine exigeante"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "randonnée alpine difficile"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Chemin partagé"
@@ -22160,38 +22146,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Modifier un chemin partagé"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "Échelle CAS (classification du Club Alpin Suisse)"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "randonnée"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "randonnée en montagne"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "randonnée en montagne exigeante"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "randonnée alpine"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "randonnée alpine exigeante"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "randonnée alpine difficile"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "excellent"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "bon"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "rouge"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "mauvais"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "horrible"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Fauteuils roulants"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Motoneige"
@@ -22200,5 +22216,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Chemin équestre"
@@ -22206,5 +22222,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Modifier un chemin équestre"
@@ -22212,5 +22228,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Piste cyclable"
@@ -22228,11 +22244,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Modifier une piste cyclable"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Piétons"
@@ -22240,5 +22256,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Chemins séparés pour piétions et cyclistes"
@@ -22246,5 +22262,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Chemin pour piétions et cyclistes"
@@ -22252,5 +22268,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Chemin réservé aux piétons"
@@ -22259,15 +22275,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Modifier un chemin réservé aux piétons"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Vélos"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Escaliers"
@@ -22277,10 +22289,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Modifier des escaliers"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Échangeur"
@@ -22288,15 +22300,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Modifier un échangeur"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Numéro"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Aire de repos"
@@ -22304,5 +22316,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Modifier une aire de repos"
@@ -22342,17 +22354,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Compagnie"
@@ -22361,5 +22373,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Feux tricolores"
@@ -22369,5 +22381,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Type de passage piéton"
@@ -22376,27 +22388,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "non contrôlé"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "feux tricolores"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "îlot"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "non marqué"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Traversée à cheval"
@@ -22404,6 +22416,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Traversée à vélo"
@@ -22412,11 +22424,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Aide à la traversée"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Nom du type de passage (RU)"
@@ -22424,30 +22436,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pélican"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pégase"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "TIGER"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -22455,5 +22467,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Passage piéton"
@@ -22462,14 +22474,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Modifier un passage piéton"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Type (RU)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Ralentisseur"
@@ -22477,33 +22489,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Modifier un ralentisseur"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "petit dos d’âne"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "chicane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "rétrécissement"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "coussin berlinois"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "dos d’âne"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "plateau"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Aire de croisement"
@@ -22511,5 +22523,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Modifier l'aire de croisement"
@@ -22517,5 +22529,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini giratoire"
@@ -22526,14 +22538,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Sens"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "sens horaire"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Rond-point interne"
@@ -22543,5 +22555,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Limite communale"
@@ -22549,15 +22561,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Modifier une limite communale"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Nom secondaire"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Radar fixe"
@@ -22566,5 +22578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Borne d’appel d’urgence"
@@ -22572,5 +22584,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Descente dangereuse"
@@ -22578,5 +22590,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Descente très dangereuse"
@@ -22584,5 +22596,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Boîte avec sable / sel"
@@ -22592,10 +22604,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Gué"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Modifier un gué"
@@ -22603,5 +22615,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Col de montagne"
@@ -22609,5 +22621,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Modifier un col de montagne"
@@ -22619,7 +22631,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Altitude"
@@ -22627,5 +22639,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barrières"
@@ -22633,5 +22645,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Plot"
@@ -22639,5 +22651,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Modifier une bitte d’amarrage"
@@ -22682,16 +22694,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Trafic autorisé :"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Barrière pour cycles"
@@ -22700,5 +22712,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Obstacle"
@@ -22706,5 +22718,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Grille à bétail"
@@ -22712,10 +22724,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Modifier une grille à bétail"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Entrée de voie de bus (Allemagne)"
@@ -22723,15 +22735,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Pointes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Modifier pointes"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Péage"
@@ -22739,5 +22751,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Modifier un péage"
@@ -22745,10 +22757,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Douane"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Modifier douane"
@@ -22758,5 +22770,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Haie"
@@ -22767,22 +22779,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Clôture"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "clôture"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "clôture en bois"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "clôture en fil de fer"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Mur"
@@ -22790,5 +22802,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Rempart"
@@ -22797,5 +22809,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Mur de soutènement"
@@ -22807,10 +22819,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Entrée"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Editez une entrée"
@@ -22818,5 +22830,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Porte"
@@ -22824,50 +22836,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Modifier une porte"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Barrière"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Modifier une barrière"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Porte de clôture"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Modifier une Porte de clôture"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Barrière mobile"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Modifier une barrière mobile"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Portillon"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Modifier un portillon"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Échalier"
@@ -22875,25 +22887,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Modifier un échalier"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Tourniquet"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Modifier un tourniquet"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Entrée de château, de fort..."
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Modifier une entrée de château, de fort..."
@@ -22904,11 +22916,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Hydrographie"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Source"
@@ -22916,5 +22928,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Modifier une source"
@@ -22922,5 +22934,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Canal d’évacuation"
@@ -22928,10 +22940,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Modifier un canal d’évacuation"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Fossé"
@@ -22939,10 +22951,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Modifier un fossé"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Ruisseau"
@@ -22950,10 +22962,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Modifier un ruisseau"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Canal"
@@ -22961,10 +22973,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Modifier un canal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Fleuve, rivière"
@@ -22974,5 +22986,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Modifier un fleuve/une rivière"
@@ -22980,15 +22992,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Modifier une surface d'eau"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Terre"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Editez un terrain"
@@ -22996,15 +23008,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Bassin"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Modifier un bassin"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Bassin de retenue"
@@ -23012,15 +23024,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Modifier un bassin de retenue"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Réservoir couvert"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Modifier un réservoir couvert"
@@ -23028,5 +23040,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Lit d’un fleuve/d’une rivière"
@@ -23035,10 +23047,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Modifier le lit d’un fleuve/d’une rivière"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Zone humide"
@@ -23049,14 +23061,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Modifier une zone humide"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "marécage"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "tourbière"
@@ -23070,35 +23082,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marais"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "roselière"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "marais salant"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "vasière"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Terrain boueux"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Modifier un terrain boueux"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Plage"
@@ -23106,20 +23118,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Modifier une plage"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Baie"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Modifier une baie"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Falaise"
@@ -23127,10 +23139,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Modifier une falaise"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Ligne côtière"
@@ -23138,5 +23150,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Modifier une ligne côtière"
@@ -23144,5 +23156,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Itinéraire de ferry"
@@ -23150,5 +23162,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Modifier un itinéraire de ferry"
@@ -23157,5 +23169,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Chantier naval"
@@ -23163,10 +23175,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Modifier un chantier naval"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dock"
@@ -23174,5 +23186,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Modifier un dock"
@@ -23180,5 +23192,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Barrage"
@@ -23186,15 +23198,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Modifier un barrage"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Voie fluviale"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Écluse"
@@ -23203,5 +23215,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Seuil"
@@ -23209,20 +23221,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Modifier un seuil"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Cascade"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Modifier une cascade"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Point de retournement"
@@ -23231,15 +23243,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Modifier une marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Jetée/Ponton"
@@ -23247,10 +23259,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Modifier une jetée/un ponton"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Terminal pour ferry"
@@ -23258,10 +23270,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Modifier un terminal pour ferry"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Plan incliné"
@@ -23271,20 +23283,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Modifier un plan incliné"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transport"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Voie ferrée"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Voie ferrée"
@@ -23292,5 +23304,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Modifier une voie ferrée"
@@ -23320,86 +23332,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Écartement (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -23411,8 +23348,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Type"
@@ -23426,29 +23363,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "triage"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "voie de garage"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "embranchement"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Électrifié"
@@ -23461,8 +23398,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "par câble aérien"
@@ -23533,8 +23470,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23546,8 +23483,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Tension"
@@ -23560,8 +23497,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Fréquence (Hz)"
@@ -23574,23 +23511,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Voie ferrée étroite"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifier une voie ferrée étroite"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -23598,50 +23535,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Modifier un monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Voie ferrée touristique"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Modifier une voie ferrée touristique"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Train-Tram"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Modifier un Train-Tram"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Métro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Modifier un métro"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tramway"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Modifier un tramway"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Voie réservée aux bus guidés"
@@ -23649,5 +23586,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Modifier une voie réservée aux bus guidés"
@@ -23656,10 +23593,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Voie désaffectée"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Modifier une voie désaffectée"
@@ -23668,9 +23605,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Types optionels"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Voie abandonnée"
@@ -23679,5 +23616,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Passage à niveau routier"
@@ -23686,5 +23623,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Passage à niveau piéton"
@@ -23694,5 +23631,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Type de passage à niveau"
@@ -23700,5 +23637,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Plaque tournante"
@@ -23707,5 +23644,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Buttoir"
@@ -23714,10 +23651,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Transport aérien par câble"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Télésiège"
@@ -23725,10 +23662,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Modifier un télésiège"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Téléski"
@@ -23736,10 +23673,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Modifier un téléski"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Télécabine"
@@ -23747,10 +23684,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Modifier un télécabine"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Œufs"
@@ -23758,10 +23695,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Modifier des œufs"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23770,5 +23707,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23776,5 +23713,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23783,5 +23720,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23789,5 +23726,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Station service"
@@ -23797,62 +23734,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Modifier une station service"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol YPF"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Indépendant"
@@ -23910,32 +23847,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Horaires d’ouverture"
@@ -23994,165 +23931,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24h/24 7j/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lun-Ven 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Mar-Dim 08:00-15:00 ; Sam 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Types de carburant :"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Gazole"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Biogazole"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Gazole de type GTL"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Gazole pour poids lourds"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "Indice d’octane de 91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "Indice d’octane de 95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "Indice d’octane de 98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "Indice d’octane de 100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (mélange à 10% d’éthanol)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (Superéthanol)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (Gaz de Pétrole Liquéfié)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNV (Gaz Naturel pour Véhicules)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "Mélange 1/25 (cyclomoteur)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "Mélange 1/50 (cyclomoteur)"
@@ -24169,5 +24106,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -24177,5 +24114,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Modifier un parking"
@@ -24186,25 +24123,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Numéro de référence"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "couvert"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "surface"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "souterraine"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Parc relais"
@@ -24213,48 +24150,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Payant"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Capacité"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Emplacements pour handicapés"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Emplacements pour femmes"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Emplacements pour parents"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Voir le Wiki pour les autres types de capacité."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Lavage"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Modifier un espace de lavage de voitures"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Garagiste"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Modifier un garagiste"
@@ -24262,5 +24199,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Location"
@@ -24269,10 +24206,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Modifier une location de voiture"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Station d’autopartage"
@@ -24280,5 +24217,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Modifier une station d’autopartage"
@@ -24286,10 +24223,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Modifier un parking à vélo"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacité"
@@ -24298,10 +24235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Modifier une location de vélos"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -24311,5 +24248,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -24317,5 +24254,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "Référence UIC"
@@ -24323,5 +24260,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Halte ferroviaire"
@@ -24329,5 +24266,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Modifier une halte ferroviaire"
@@ -24335,5 +24272,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Arrêt de tramway"
@@ -24342,5 +24279,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Modifier un arrêt de tramway"
@@ -24348,5 +24285,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Quai"
@@ -24355,5 +24292,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Modifier un quai"
@@ -24365,5 +24302,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Numéro de voie"
@@ -24371,10 +24308,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Surface"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Bouche de métro"
@@ -24383,10 +24320,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Modifier une bouche de métro"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Fauteuils roulants"
@@ -24395,5 +24332,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Gare routière"
@@ -24402,5 +24339,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Modifier une gare routière"
@@ -24408,5 +24345,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Arrêt de bus"
@@ -24416,5 +24353,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Modifier un arrêt de bus"
@@ -24423,6 +24360,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Abri"
@@ -24430,19 +24367,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Banc"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Bande rugueuse"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Plateforme de bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Modifier une plateforme de bus"
@@ -24450,5 +24387,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -24456,5 +24393,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Modifier une station de taxi"
@@ -24462,10 +24399,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Aéroport"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Aéroport"
@@ -24473,5 +24410,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Modifier un aéroport"
@@ -24479,10 +24416,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "Code AITA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "Code OACI"
@@ -24491,5 +24428,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Piste d’atterrissage / d’envol"
@@ -24497,5 +24434,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Modifier une piste d’atterrissage / d’envol"
@@ -24503,5 +24440,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Voie de circulation"
@@ -24509,5 +24446,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Modifier une voie de circulation"
@@ -24515,5 +24452,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Héliport"
@@ -24521,5 +24458,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Modifier héliport"
@@ -24529,5 +24466,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Aire de stationnement"
@@ -24537,5 +24474,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar d’aéroport"
@@ -24546,6 +24483,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Balise lumineuse"
@@ -24555,5 +24492,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Manche à air"
@@ -24562,5 +24499,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Aérogare"
@@ -24568,5 +24505,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Modifier un aérogare"
@@ -24574,15 +24511,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Modifier une porte d’embarquement"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Voyage"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Hôtel"
@@ -24594,5 +24531,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hôtel"
@@ -24601,15 +24538,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Modifier un hôtel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Étoiles"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24617,20 +24554,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Modifier un motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Chambre d’hôtes"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Modifier une chambre d’hôtes"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chalet"
@@ -24638,10 +24575,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Modifier un chalet"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Auberge de jeunesse"
@@ -24649,30 +24586,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Modifier une auberge de jeunesse"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Refuge"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Modifier un refuge"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Site pour caravanes"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Modifier un site pour caravanes"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Camping"
@@ -24680,10 +24617,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Modifier un camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Restauration"
@@ -24694,5 +24631,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -24700,5 +24637,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Modifier un restaurant"
@@ -24706,5 +24643,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cuisine"
@@ -24712,73 +24649,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italienne"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chinoise"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "grecque"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "allemande"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indienne"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "régionale"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turque"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatique"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thaïlandaise"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexicaine"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japonaise"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "française"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "sandwich"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast-Food"
@@ -24786,17 +24723,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifier un fast-food"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "poisson et frites"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "poulet"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Café"
@@ -24804,9 +24741,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Modifier un café"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub (anglo-saxon)"
@@ -24814,18 +24751,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Modifier un pub (anglo-saxon)"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Modifier un biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -24833,9 +24770,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Modifier un bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Boîte de nuit"
@@ -24843,24 +24780,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Modifier une boîte de nuit"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Tourisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attraction"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Modifier une attraction"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Musée"
@@ -24868,9 +24805,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Modifier un musée"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24879,9 +24816,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Modifier un zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Point de vue"
@@ -24889,24 +24826,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Modifier un point de vue"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Tour de surveillance"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Parc d’attraction"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Modifier un parc d’attraction"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Œuvre d'art"
@@ -24914,5 +24851,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Modifier une œuvre d’art"
@@ -24920,19 +24857,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Office du Tourisme"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Carte"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Niveau de détail"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "carte topographique"
@@ -24970,5 +24907,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24976,28 +24913,28 @@
 msgstr "rue"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "carte schématique"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Zone affichée"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "Site"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "Ville"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "Région"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Description"
@@ -25007,5 +24944,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Affichage des itinéraires de :"
@@ -25013,5 +24950,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Randonnée"
@@ -25019,6 +24956,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyclisme"
@@ -25026,5 +24963,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "VTT"
@@ -25032,6 +24969,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ski"
@@ -25039,5 +24976,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Équitation"
@@ -25045,46 +24982,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "…autres modes de transport possibles"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Panneau d’informations"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Contenu du panneau"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "annonce"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "histoire"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "nature"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "faune"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "flore"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Poteau indicateur"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Terminal d’informations"
@@ -25092,29 +25029,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Description"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Guide audio"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Guide audio par téléphone portable ?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Numéro de téléphone"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Point d’information"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Modifier un abri"
@@ -25122,25 +25059,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Cheminée"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Site de pique-nique"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Modifier un site de pique-nique"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Patrimoine"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Château"
@@ -25149,19 +25086,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Modifier un château"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruines"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Modifier des ruines"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Site archéologique"
@@ -25170,9 +25107,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Modifier un site archéologique"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Lieu de bataille"
@@ -25180,10 +25117,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Modifier un lieu de bataille"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Site paléontologique"
@@ -25191,5 +25128,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Modifier un site paléontologique"
@@ -25197,15 +25134,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Modifier un monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Mémorial"
@@ -25213,55 +25150,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Modifier un mémorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Croix"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Modifier une croix"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Chapelle"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Modifier une chapelle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Pierre frontalière"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Modifier une pierre frontalière"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Loisir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parc aquatique"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Modifier un parc aquatique"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Terrain de jeux pour enfants"
@@ -25269,35 +25206,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Modifier un terrain de jeux pour enfants"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pêche"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Modifier un lieu de pêche"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sports"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Terrains de sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stade"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Modifier un stade"
@@ -25311,6 +25248,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Selectionnez un sport :"
@@ -25702,6 +25639,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25735,225 +25672,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multisport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tir à l’arc"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "athlétisme"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "football australien"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boulingrin"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoë"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalade"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "filets de cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cyclisme"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "course de chiens"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "équitation"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football américain"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastique"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "course de chevaux"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "moteur"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelote"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "sport de raquettes"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "chasse"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "roller"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natation"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tennis de table"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centre sportif"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Modifier un centre sportif"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Terrain de sport"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Modifier un terrain de sport"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Circuit"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Modifier un circuit"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Modifier un terrain de golf"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Modifier un minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sports"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multisport"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Modifier un terrain multisport"
@@ -25992,21 +25929,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "type"
@@ -26045,203 +25982,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "terrain"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "centre de sports"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadium"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "piste"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Modifier un bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Athlétisme"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Modifier l’athlétisme"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tir à l’arc"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Modifier le tir à l’arc"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Escalade"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Modifier l'escalade"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoë"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Modifier le canoë"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Modifier le cyclisme"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Course de chiens"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Modifier une course de chiens"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Équitation"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Modifier un sport équestre"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Course de chevaux"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Modifier une course de chevaux"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastique"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Modifier la gymnastique"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Sport mécanique"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Modifier un sport mécanique"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Roller"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Modifier le roller"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Modifier le skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Natation"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Modifier la natation"
@@ -26249,52 +26186,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Type de ski"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "alpin"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "nordique"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snowpark"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficulté"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "verte"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "bleue"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "noire"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "orange"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "jaune"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Tir sportif"
@@ -26302,177 +26239,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Modifier le tir sportif"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sports de balle"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Football"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Modifier le football"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football américain"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Modifier le football américain"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Football australien"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Modifier le football australien"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Modifier le baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Modifier le basketball"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Modifier un parcours de golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_course"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Jeu de boules"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Modifier le jeu de boules"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Boulingrin"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Modifier le boulingrin"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Modifier le cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Filets de cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Modifier des filets de cricket"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Modifier le croquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Modifier le hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelote"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Modifier la pelote basque"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Sport de raquette"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Modifier un sport de raquette"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Modifier le rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tennis de table"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Modifier le tennis de table"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Modifier le tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificiel"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bâtiment"
@@ -26480,5 +26417,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Bâtiment public"
@@ -26486,10 +26423,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Modifier un bâtiment public"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Mairie"
@@ -26497,10 +26434,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Modifier une mairie"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -26508,10 +26445,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Modifier une ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Palais de justice"
@@ -26520,10 +26457,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Modifier un palais de justice"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prison"
@@ -26532,10 +26469,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Modifier une prison"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Commissariat de police"
@@ -26545,10 +26482,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Modifier un commissariat de police"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Caserne de pompiers"
@@ -26557,10 +26494,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Modifier une caserne de pompiers"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Bureau de poste"
@@ -26568,5 +26505,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Modifier un bureau de poste"
@@ -26574,15 +26511,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Modifier un jardin d’enfants"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "École"
@@ -26590,10 +26527,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Modifier une école"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Université"
@@ -26601,10 +26538,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Modifier une université"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Établissement d’enseignement supérieur"
@@ -26612,5 +26549,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Modifier un établissement d’enseignement supérieur"
@@ -26618,5 +26555,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinéma"
@@ -26625,10 +26562,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Modifier un cinéma"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliothèque"
@@ -26637,9 +26574,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Modifier une bibliothèque"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centre artistique"
@@ -26647,10 +26584,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Modifier un centre artistique"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Théâtre"
@@ -26659,10 +26596,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Modifier un théatre"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lieu de culte"
@@ -26672,5 +26609,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Modifier un lieu de culte"
@@ -26679,6 +26616,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -26687,66 +26624,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahaïsme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "bouddhisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "christianisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindouisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jaïnisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judaïsme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikhisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoïsme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Dénomination"
@@ -26755,81 +26692,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglicanisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "catholicisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "évangélisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "témoins de Jehovah"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luthérianisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "méthodisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormonisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodoxie"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecôtisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbytérianisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestantisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "chiisme"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnisme"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresses"
@@ -26838,5 +26775,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Modifier l’adresse"
@@ -26844,5 +26781,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numéro du bâtiment"
@@ -26850,25 +26787,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nom de la maison"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nom de la rue"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nom de la ville"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Code postal"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Indicatif du pays"
@@ -26877,5 +26814,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Modifier une interpolation d’adresse"
@@ -26883,61 +26820,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numérotation"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "pair"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "impair"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alphabétique"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Édifices"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Usine"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Modifier une usine"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Structure de grande hauteur"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Modifier une structure de grande hauteur"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Type de structure"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "communication"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observation"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Hauteur (mètres)"
@@ -26945,25 +26882,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Château d’eau"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Modifier un château d’eau"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gazomètre"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Modifier un gazomètre"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Phare"
@@ -26971,10 +26908,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Modifier un phare"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Moulin à vent"
@@ -26982,10 +26919,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Modifier un moulin à vent"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Canalisation"
@@ -26995,41 +26932,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Modifier une canalisation"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "turbine à gaz"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "chaleur"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "pétrole"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "égouts"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "toute substance"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Commune"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "sous-marine"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "aérienne"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Station d’épuration"
@@ -27039,10 +26976,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Modifier une station d’épuration"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Grue"
@@ -27050,5 +26987,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Modifier une grue"
@@ -27056,10 +26993,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Modifier une balise lumineuse"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Équipement de topographie"
@@ -27067,10 +27004,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Modifier un équipement de topographie"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Surveillance"
@@ -27078,23 +27015,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Modifier une caméra de surveillance"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "intérieur"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "extérieur"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "public"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Centrale électrique"
@@ -27104,35 +27041,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Modifier une centrale électrique"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "éolienne"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hydroélectrique"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossile"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nucléaire"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "charbon"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "solaire photovoltaïque"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Station électrique"
@@ -27141,10 +27078,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Modifier une station électrique"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Transformateur électrique"
@@ -27153,5 +27090,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Modifier un transformateur électrique"
@@ -27159,10 +27096,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Référence de la ligne"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Pylône électrique"
@@ -27173,23 +27110,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Modifier un pylône électrique"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "pylônes"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "pylône"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Référence du pylône"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Ligne électrique"
@@ -27198,74 +27135,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Modifier une ligne électrique"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Type de ligne"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "à haute tension"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "à basse tension"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Nombre de câbles"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Nombre de conducteurs par câbles"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "simple"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "double"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "triple"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quadruple"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Équipements"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toilettes publiques"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limité"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Paiement"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Boîte aux lettres"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Cabine téléphonique"
@@ -27274,5 +27211,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Modifier une cabine téléphonique"
@@ -27280,5 +27217,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Pièces"
@@ -27286,5 +27223,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Billets"
@@ -27292,5 +27229,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Porte-monnaie électronique"
@@ -27298,5 +27235,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Cartes de débit"
@@ -27304,15 +27241,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Cartes de crédit"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Cartes téléphoniques"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Point de recyclage"
@@ -27321,5 +27258,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Modifier un point de recyclage"
@@ -27327,35 +27264,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batteries"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Canettes"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Vêtements"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Verre"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Ferraille"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Poubelle"
@@ -27363,5 +27300,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Modifier une poubelle"
@@ -27370,31 +27307,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Dossier"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Matériau"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "pierre"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastique"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Couleur"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "noir"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "marron"
@@ -27473,5 +27410,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27481,31 +27418,31 @@
 msgstr "vert"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "rouge"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "bleu"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "gris"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "blanc"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Nombre de places"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Hutte de chasse"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Hutte de chasse"
@@ -27514,30 +27451,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Hauteur"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "faible"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "moyenne"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "grande"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Camouflé"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Verrouillé"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontaine"
@@ -27546,10 +27483,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Modifier une fontaine"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Point d’eau potable"
@@ -27558,10 +27495,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Modifier un point d’eau potable"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Hydrant"
@@ -27570,5 +27507,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Modifier un hydrant"
@@ -27576,5 +27513,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Tour d’abandon"
@@ -27582,15 +27519,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Modifier une tour d’abandon"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Commerce"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Concessionnaire automobile"
@@ -27598,10 +27535,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Modifier une concession"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Magasin de vélos"
@@ -27610,28 +27547,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Modifier un magasin de vélo"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarché"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Modifier un supermarché"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Droguerie"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Modifier une droguerie"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Épicerie"
@@ -27639,9 +27576,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Modifier une épicerie"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosque à journaux"
@@ -27649,27 +27586,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Modifier un kiosque à journaux"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Librairie"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Modifier une librairie"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Agence de voyage"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Modifier une agence de voyage"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Boucherie"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Modifier une boucherie"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Boulangerie"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Modifier une boulangerie"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Fleuriste"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Modifier un fleuriste"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Magasin bio"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Modifier un magasin bio"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alcool"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Modifier un magasin d’alcool"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Boissons"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Modifier un magasin de boissons"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Informatique"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Modifier un magasin d’informatique"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Électronique"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Modifier un magasin d’électronique"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Modifier un magasin Hi-Fi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Ameublement"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Modifier un magasin d’ameublement"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Jardinerie"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Modifier une jardinerie"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Quincaillerie"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Modifier une quincaillerie"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Bricolage"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Modifier un magasin de bricolage"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Papeterie"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Modifier une papeterie"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Salon de coiffure"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Modifier un salon de coiffure"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Chaussures"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Modifier un magasin de chaussures"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Jouets"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Modifier un magasin de jouets"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Vidéoclub"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Modifier un vidéoclub"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Pressing"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Modifier un pressing"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Laverie"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Modifier une laverie"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Sports en plein air"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Modifier un magasin de sports en plein air"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Modifier un magasin de sport"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Opticien"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Modifier un opticien"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Distributeur automatique"
@@ -27677,5 +27828,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Modifier un distributeur automatique"
@@ -27683,306 +27834,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Produits vendus"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "tickets de transport public"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "plans de transport public"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "tickets de parking"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "nourriture"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "boissons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "bonbons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarettes"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "photos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "alimentation animale"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "journaux"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "jouets"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "timbres"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "cartes SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "bons téléphoniques"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "vouchers"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "vélo"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "préservatifs"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "sacs pour excrément"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Cartes de fidélité"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Boucherie"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Modifier une boucherie"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Boulangerie"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Modifier une boulangerie"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Fleuriste"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Modifier un fleuriste"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Magasin bio"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Modifier un magasin bio"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alcool"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Modifier un magasin d’alcool"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Boissons"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Modifier un magasin de boissons"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Informatique"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Modifier un magasin d’informatique"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Électronique"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Modifier un magasin d’électronique"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Modifier un magasin Hi-Fi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Ameublement"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Modifier un magasin d’ameublement"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Jardinerie"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Modifier une jardinerie"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Quincaillerie"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Modifier une quincaillerie"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Bricolage"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Modifier un magasin de bricolage"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Papeterie"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Modifier une papeterie"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Salon de coiffure"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Modifier un salon de coiffure"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Chaussures"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Modifier un magasin de chaussures"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Jouets"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Modifier un magasin de jouets"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Vidéoclub"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Modifier un vidéoclub"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Pressing"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Modifier un pressing"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Laverie"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Modifier une laverie"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Sports en plein air"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Modifier un magasin de sports en plein air"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Modifier un magasin de sport"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Opticien"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Modifier un opticien"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Argent"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banque"
@@ -27990,14 +27933,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Modifier une banque"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Distributeur automatique"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Bureau de change"
@@ -28005,5 +27948,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Modifier un bureau de change"
@@ -28011,15 +27954,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Modifier un distributeur automatique"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Santé"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Cabinet médical"
@@ -28027,18 +27970,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Modifier un cabinet médical"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Cabinet dentaire"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Modifier un cabinet dentaire"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Pharmacie"
@@ -28046,5 +27989,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Modifier une pharmacie"
@@ -28052,9 +27995,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Dispensaire"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hôpital"
@@ -28062,10 +28005,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Modifier un hôpital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Point d’accès d’urgence"
@@ -28074,5 +28017,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Modifier un point d’accès d’urgence"
@@ -28081,20 +28024,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Numéro du point"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Nom du point"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Numéro de téléphone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Utiliser le code international, comme +12-345-67890)"
@@ -28102,5 +28045,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Cabinet vétérinaire"
@@ -28109,64 +28052,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Modifier un cabinet vétérinaire"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Géographie"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Lieux"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Modifier un continent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Pays"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Modifier un pays"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Département"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Modifier un département"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Région"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Modifier une région"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Comté/Canton"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Modifier un comté/canton"
@@ -28174,15 +28117,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Ville de plus de 100 000 habitants"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Ville de 10 000 à 100 000 habitants"
@@ -28190,10 +28133,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Modifier une ville"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Banlieue"
@@ -28201,25 +28144,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Modifier une banlieue"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Village"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Modifier un village"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Hameau"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Modifier un hameau"
@@ -28227,5 +28170,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Lieu-dit"
@@ -28233,10 +28176,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Modifier un lieu-dit"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "île"
@@ -28244,10 +28187,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Modifier une île"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "îlot"
@@ -28255,5 +28198,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Modifier un îlot"
@@ -28261,5 +28204,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Entrée de grotte"
@@ -28267,10 +28210,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Modifier une entrée de grotte"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Sommet"
@@ -28278,10 +28221,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Modifier un sommet"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Glacier"
@@ -28289,10 +28232,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Modifier un glacier"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Volcan"
@@ -28300,70 +28243,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Modifier un volcan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Frontières"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nationale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Modifier une frontière nationale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrative"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Modifier une frontière administrative"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Modifier une frontière civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Électorale"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Modifier une zone électorale"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Parc national"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Modifier une frontière d’un parc national"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Utilisation du terrain"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Arbre"
@@ -28372,15 +28315,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Modifier un arbre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Nom botanique"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Bois"
@@ -28389,5 +28332,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Modifier un bois"
@@ -28395,17 +28338,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "conifères"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "feuillus"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "conifères et feuillus"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Forêt"
@@ -28414,14 +28357,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Modifier une  forêt"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Réserve naturelle"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Modifier une réserve naturelle"
@@ -28429,25 +28372,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Zone d’éboulements"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Modifier une zone d’éboulements"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Broussailles"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Modifier des broussailles"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Talus"
@@ -28455,10 +28398,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Modifier un talus"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Lande"
@@ -28466,5 +28409,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Modifier une lande"
@@ -28472,5 +28415,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Cour de ferme"
@@ -28479,45 +28422,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Modifier une cour de ferme"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Terre arable"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Modifier une terre arable"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Prairie"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Modifier une prairie"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vigne"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Modifier une vigne"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Jardins familiaux"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Modifier des jardins familiaux"
@@ -28525,25 +28468,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Jardin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Modifier un jardin"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Herbe"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Modifier une zone herborée"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Village green (anglo-saxon)"
@@ -28551,10 +28494,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Modifier un village green (anglo-saxon)"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Espace publique"
@@ -28562,20 +28505,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Modifier un espace publique"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Parc"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Modifier un Parc"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Aire de jeux"
@@ -28583,5 +28526,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifier une aire de jeux"
@@ -28589,15 +28532,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Zone résidentielle"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Modifier une zone résidentielle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Petit cimetière"
@@ -28605,9 +28548,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Modifier un petit cimetière"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cimetière"
@@ -28615,39 +28558,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Modifier un cimetière"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Zone de commerces"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Modifier une zone de commerces"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Zone de bureaux"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Modifier une zone de bureaux"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Zone industrielle"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Modifier une zone industrielle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Zone ferroviaire"
@@ -28655,15 +28598,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Modifier une zone ferroviaire"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Terrain militaire"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Modifier un terrain militaire"
@@ -28671,50 +28614,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Chantier"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Modifier un chantier"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Terrain vague"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Modifier un terrain vague"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Zone d’aménagement"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Modifier une zone d’aménagement"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Décharge"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Modifier une décharge"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Carrière"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Modifier une carrière"
@@ -28724,5 +28667,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Modifier un multipolygone"
@@ -28731,10 +28674,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "segment extérieur"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "segment intérieur"
@@ -28742,5 +28685,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Interdiction de tourner"
@@ -28749,5 +28692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Modifier une interdiction de tourner"
@@ -28755,34 +28698,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Restriction"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "Interdiction de tourner à gauche"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "Interdiction de tourner à droite"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "Interdiction d’aller tout droit"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "Interdiction de faire demi-tour"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "Obligation de tourner à droite"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "Obligation de tourner à gauche"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "Obligation d’aller tout droit"
@@ -28791,15 +28734,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "chemin d’origine"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "nœud ou chemin \"via\""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "au chemin"
@@ -28807,5 +28750,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Itinéraire"
@@ -28814,5 +28757,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Modifier un itinéraire"
@@ -28820,5 +28763,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Type d’itinéraire"
@@ -28909,5 +28852,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28917,17 +28860,17 @@
 msgstr "vélo"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "route"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ferry"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -28987,5 +28930,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28994,9 +28937,9 @@
 msgstr "voie piétonnière"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "détour"
@@ -29010,10 +28953,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "métro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbole"
@@ -29021,31 +28964,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Réseau"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "État de l’itinéraire"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "proposé"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternatif"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporaire"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "connexion"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Couleur (hexadécimale)"
@@ -29054,32 +28997,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "segment d’itinéraire"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "segment suivant"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "segment précédent"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "point d’arrêt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "point d’arrêt suivant"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "point d’arrêt précédent"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -33102,4 +33120,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicile - Italie"
+
+#~ msgid "Bikes"
+#~ msgstr "Vélos"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/gl.po
===================================================================
--- /applications/editors/josm/i18n/po/gl.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/gl.po	(revision 20945)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
 "PO-Revision-Date: 2010-01-23 22:22+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1189,5 +1189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Non se poden mover objectos fora do mundo."
@@ -1502,5 +1502,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2262,9 +2262,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2347,27 +2347,27 @@
 msgstr "Rematar debuxo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extrudir"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Crear áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extrudir Vía"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Debuxar un rectángulo do tamaño desexado, despois soltar o botón do rato."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2387,6 +2387,6 @@
 "audio dende alí; MAIÚS+soltar para sincronizar o audio en ese punto."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2398,9 +2398,9 @@
 msgstr "Seleccionar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Seleccionar, mover e rotar obxectos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2409,17 +2409,17 @@
 msgstr[1] "Engadir e mover un novo nodo virtual a {0} vías."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2429,9 +2429,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Soltar o botón do rato para seleccionar os obxectos do rectángulo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2440,9 +2440,9 @@
 "próximo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Soltar o botón do rato para deter a rotación."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3180,5 +3180,5 @@
 msgstr "Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3754,12 +3754,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Cargar Selección"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Sen etiquetar"
+msgstr ""
 
 #. teal
@@ -3940,5 +3938,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "Vía férrea"
@@ -5222,5 +5220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -5637,4 +5635,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5726,5 +5729,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relacións"
@@ -5826,9 +5829,9 @@
 msgstr "Selección: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Desacoplar o panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5837,5 +5840,5 @@
 "da esquerda."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Facer click para minimizar/maximizar o contido do panel"
@@ -6166,4 +6169,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6176,10 +6185,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6849,145 +6852,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nome"
@@ -8206,10 +8209,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr ""
@@ -8217,5 +8220,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8229,17 +8231,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "descoñecido"
@@ -9017,11 +9018,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9038,14 +9041,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr ""
@@ -9578,5 +9581,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr ""
@@ -10636,55 +10639,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11176,5 +11179,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Coche"
@@ -11196,16 +11199,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicicleta"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11235,12 +11239,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Pé"
@@ -14215,6 +14219,7 @@
 msgstr ""
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14305,5 +14310,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14490,5 +14495,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14529,19 +14534,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14549,5 +14554,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14560,10 +14565,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14605,7 +14610,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Ficheiro de caché da Zona Lambert 4 (.4)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14747,5 +14751,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16567,5 +16571,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr ""
@@ -16617,5 +16621,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17186,4 +17190,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "tipo"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17340,4 +17361,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Borrar a relación seleccionada"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18092,5 +18126,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19363,7 +19397,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19380,5 +19414,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr ""
@@ -19396,4 +19430,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19401,9 +19436,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19431,15 +19465,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19450,11 +19478,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr ""
@@ -19474,15 +19501,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19499,11 +19524,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19524,8 +19549,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19543,11 +19568,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr ""
@@ -19567,6 +19592,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19584,11 +19609,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19608,6 +19633,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19625,11 +19650,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19767,5 +19792,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19774,12 +19799,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19787,13 +19815,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19822,24 +19850,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr ""
@@ -19851,5 +19875,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19863,11 +19887,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19875,10 +19898,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19886,10 +19909,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19897,11 +19920,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19909,10 +19931,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19920,10 +19942,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr ""
@@ -19931,10 +19953,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19942,11 +19964,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19954,10 +19975,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19965,10 +19986,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19976,10 +19997,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19987,10 +20008,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19998,10 +20019,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -20009,10 +20030,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -20020,10 +20041,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -20104,6 +20125,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -20112,5 +20132,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -20118,6 +20138,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr ""
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr ""
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr ""
@@ -20126,15 +20175,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -20142,5 +20191,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20182,28 +20231,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr ""
@@ -20216,10 +20264,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20233,10 +20281,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20260,97 +20308,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20365,10 +20413,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr ""
@@ -20384,10 +20432,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr ""
@@ -20402,19 +20450,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -20422,20 +20470,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20443,5 +20491,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr ""
@@ -20452,5 +20500,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20470,10 +20518,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20495,10 +20543,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20520,10 +20568,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20545,5 +20593,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20558,9 +20606,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20574,9 +20622,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20606,10 +20654,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20639,5 +20687,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20649,10 +20697,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20660,39 +20708,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr ""
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr ""
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr ""
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr ""
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20701,73 +20720,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr ""
@@ -20776,38 +20763,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20816,5 +20833,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20822,5 +20839,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20828,5 +20845,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20844,11 +20861,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20856,5 +20873,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20862,5 +20879,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20868,5 +20885,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20875,15 +20892,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
-msgstr ""
-
-#: build/trans_presets.java:600
-msgid "Bikes"
 msgstr ""
 
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr ""
@@ -20893,10 +20906,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr ""
@@ -20904,15 +20917,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr ""
@@ -20920,5 +20933,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -20958,17 +20971,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr ""
@@ -20977,5 +20990,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr ""
@@ -20985,5 +20998,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20992,27 +21005,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -21020,6 +21033,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -21028,11 +21041,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21040,30 +21053,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr ""
@@ -21071,5 +21084,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -21078,14 +21091,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21093,33 +21106,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21127,5 +21140,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21133,5 +21146,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21142,14 +21155,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21159,5 +21172,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr ""
@@ -21165,15 +21178,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:690
+msgid "Edit City Limit Sign"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:695
+msgid "Second Name"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:697
-msgid "Edit City Limit Sign"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
-msgid "Second Name"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
 msgid "Speed Camera"
 msgstr ""
@@ -21182,5 +21195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr ""
@@ -21188,5 +21201,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21194,5 +21207,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21200,5 +21213,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21208,10 +21221,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21219,5 +21232,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr ""
@@ -21225,5 +21238,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -21235,7 +21248,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr ""
@@ -21243,5 +21256,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr ""
@@ -21249,5 +21262,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21255,5 +21268,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21298,16 +21311,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21316,5 +21329,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21322,5 +21335,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21328,10 +21341,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21339,15 +21352,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21355,5 +21368,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21361,10 +21374,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21374,5 +21387,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21383,22 +21396,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21406,5 +21419,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21413,5 +21426,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21423,10 +21436,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21434,5 +21447,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr ""
@@ -21440,50 +21453,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21491,25 +21504,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21520,11 +21533,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr ""
@@ -21532,5 +21545,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr ""
@@ -21538,5 +21551,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21544,10 +21557,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21555,10 +21568,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr ""
@@ -21566,10 +21579,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr ""
@@ -21577,10 +21590,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr ""
@@ -21590,5 +21603,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr ""
@@ -21596,15 +21609,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr ""
@@ -21612,15 +21625,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21628,15 +21641,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21644,5 +21657,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -21651,10 +21664,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21665,14 +21678,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21686,35 +21699,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
 #: build/trans_presets.java:1039
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1041
-msgid "Mud"
-msgstr ""
-
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
 msgid "Beach"
 msgstr ""
@@ -21722,20 +21735,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr ""
@@ -21743,10 +21756,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr ""
@@ -21754,5 +21767,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr ""
@@ -21760,5 +21773,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr ""
@@ -21766,5 +21779,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21773,5 +21786,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21779,10 +21792,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -21790,5 +21803,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21796,5 +21809,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr ""
@@ -21802,15 +21815,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
 #: build/trans_presets.java:1097
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1104
 msgid "Lock Gate"
 msgstr ""
@@ -21819,5 +21832,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21825,20 +21838,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21847,15 +21860,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr ""
@@ -21863,10 +21876,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21874,10 +21887,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21887,20 +21900,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -21908,5 +21921,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -21936,86 +21949,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22027,8 +21965,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22042,29 +21980,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22077,8 +22015,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22149,8 +22087,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22162,8 +22100,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr ""
@@ -22176,8 +22114,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22190,23 +22128,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22214,50 +22152,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22265,5 +22203,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22272,10 +22210,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22284,9 +22222,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22295,5 +22233,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22302,5 +22240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22310,5 +22248,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22316,5 +22254,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22323,5 +22261,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22330,10 +22268,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22341,10 +22279,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22352,10 +22290,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22363,10 +22301,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22374,10 +22312,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22386,5 +22324,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22392,5 +22330,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22399,5 +22337,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22405,5 +22343,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr ""
@@ -22413,62 +22351,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr ""
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22526,32 +22464,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr ""
@@ -22610,165 +22548,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22785,5 +22723,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22793,5 +22731,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr ""
@@ -22802,25 +22740,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22829,48 +22767,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
+#: build/trans_presets.java:1362
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1363
+msgid "Spaces for Disabled"
+msgstr ""
+
+#: build/trans_presets.java:1364
+msgid "Spaces for Women"
+msgstr ""
+
+#: build/trans_presets.java:1365
+msgid "Spaces for Parents"
+msgstr ""
+
+#: build/trans_presets.java:1366
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1368
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash"
 #: build/trans_presets.java:1369
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
-msgid "Spaces for Disabled"
-msgstr ""
-
-#: build/trans_presets.java:1371
-msgid "Spaces for Women"
-msgstr ""
-
-#: build/trans_presets.java:1372
-msgid "Spaces for Parents"
-msgstr ""
-
-#: build/trans_presets.java:1373
-msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+msgid "Edit Car Wash"
+msgstr ""
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1374
+msgid "Repair"
+msgstr ""
+
+#. item "Car/Repair"
 #: build/trans_presets.java:1375
-msgid "Wash"
-msgstr ""
-
-#. item "Car/Wash"
-#: build/trans_presets.java:1376
-msgid "Edit Car Wash"
-msgstr ""
-
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
-msgid "Repair"
-msgstr ""
-
-#. item "Car/Repair"
-#: build/trans_presets.java:1382
 msgid "Edit Car Repair"
 msgstr ""
@@ -22878,5 +22816,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr ""
@@ -22885,10 +22823,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22896,5 +22834,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22902,10 +22840,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22914,10 +22852,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22927,5 +22865,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22933,5 +22871,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22939,5 +22877,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22945,5 +22883,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22951,5 +22889,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22958,5 +22896,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22964,5 +22902,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22971,5 +22909,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22981,5 +22919,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22987,10 +22925,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr ""
@@ -22999,10 +22937,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -23011,5 +22949,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr ""
@@ -23018,5 +22956,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr ""
@@ -23024,5 +22962,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr ""
@@ -23032,5 +22970,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr ""
@@ -23039,6 +22977,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -23046,19 +22984,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -23066,5 +23004,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr ""
@@ -23072,5 +23010,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr ""
@@ -23078,10 +23016,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr ""
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23089,5 +23027,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23095,10 +23033,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -23107,5 +23045,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23113,5 +23051,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23119,5 +23057,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23125,5 +23063,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23131,5 +23069,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23137,5 +23075,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23145,5 +23083,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23153,5 +23091,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23162,6 +23100,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23171,5 +23109,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23178,5 +23116,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23184,5 +23122,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23190,15 +23128,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr ""
@@ -23210,5 +23148,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -23217,15 +23155,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23233,20 +23171,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23254,10 +23192,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23265,30 +23203,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
@@ -23296,10 +23234,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr ""
@@ -23310,5 +23248,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -23316,5 +23254,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -23322,5 +23260,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23328,73 +23266,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr ""
@@ -23402,17 +23340,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr ""
@@ -23420,9 +23358,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr ""
@@ -23430,18 +23368,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23449,9 +23387,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr ""
@@ -23459,24 +23397,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1675
+msgid "Edit Nightclub"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "Tourism"
+msgstr ""
+
+#. group "Tourism"
 #: build/trans_presets.java:1682
-msgid "Edit Nightclub"
-msgstr ""
-
+msgid "Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1683
+msgid "Edit Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction" text "Opening Hours"
 #: build/trans_presets.java:1688
-msgid "Tourism"
-msgstr ""
-
-#. group "Tourism"
-#: build/trans_presets.java:1689
-msgid "Attraction"
-msgstr ""
-
-#. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
-msgid "Edit Attraction"
-msgstr ""
-
-#. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
 msgid "Museum"
 msgstr ""
@@ -23484,9 +23422,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr ""
@@ -23495,9 +23433,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr ""
@@ -23505,24 +23443,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr ""
@@ -23530,5 +23468,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -23536,19 +23474,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23586,5 +23524,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23592,28 +23530,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23623,5 +23561,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23629,5 +23567,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23635,6 +23573,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -23642,5 +23580,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23648,6 +23586,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -23655,5 +23593,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23661,46 +23599,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23708,29 +23646,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23738,25 +23676,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
+msgid "Historic Places"
+msgstr ""
+
+#. group "Historic Places"
 #: build/trans_presets.java:1814
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
-msgid "Historic Places"
-msgstr ""
-
-#. group "Historic Places"
-#: build/trans_presets.java:1821
 msgid "Castle"
 msgstr ""
@@ -23765,19 +23703,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr ""
@@ -23786,9 +23724,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr ""
@@ -23796,10 +23734,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23807,5 +23745,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23813,15 +23751,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -23829,55 +23767,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
+#: build/trans_presets.java:1869
+msgid "Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1870
+msgid "Edit Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1875
+msgid "Leisure"
+msgstr ""
+
+#. group "Leisure"
 #: build/trans_presets.java:1876
-msgid "Boundary Stone"
-msgstr ""
-
-#. item "Historic Places/Boundary Stone"
+msgid "Water Park"
+msgstr ""
+
+#. item "Leisure/Water Park"
 #: build/trans_presets.java:1877
-msgid "Edit Boundary Stone"
-msgstr ""
-
-#. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
-msgid "Leisure"
-msgstr ""
-
-#. group "Leisure"
-#: build/trans_presets.java:1883
-msgid "Water Park"
-msgstr ""
-
-#. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr ""
@@ -23885,35 +23823,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
+#: build/trans_presets.java:1888
+msgid "Edit Fishing"
+msgstr ""
+
+#. item "Leisure/Fishing" text "Name"
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
 #: build/trans_presets.java:1895
-msgid "Edit Fishing"
-msgstr ""
-
-#. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
-msgid "Sports"
-msgstr ""
-
-#. group "Sports"
-#: build/trans_presets.java:1902
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -23927,6 +23865,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr ""
@@ -24318,6 +24256,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24351,225 +24289,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
+#: build/trans_presets.java:1932
+msgid "Golf Course"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1933
+msgid "Edit Golf Course"
+msgstr ""
+
+#: build/trans_presets.java:1938
+msgid "Miniature Golf"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Miniature Golf"
 #: build/trans_presets.java:1939
-msgid "Golf Course"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
-msgid "Edit Golf Course"
+msgid "Edit Miniature Golf"
 msgstr ""
 
 #: build/trans_presets.java:1945
-msgid "Miniature Golf"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Miniature Golf"
+msgid "Sport"
+msgstr ""
+
+#. group "Sport"
 #: build/trans_presets.java:1946
-msgid "Edit Miniature Golf"
-msgstr ""
-
-#: build/trans_presets.java:1952
-msgid "Sport"
-msgstr ""
-
-#. group "Sport"
-#: build/trans_presets.java:1953
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24608,21 +24546,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tipo"
@@ -24661,203 +24599,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
+msgid "Edit Athletics"
+msgstr ""
+
+#: build/trans_presets.java:1964
+msgid "Archery"
+msgstr ""
+
+#. item "Sport/Archery"
 #: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
-msgid "Edit Athletics"
-msgstr ""
-
+msgid "Edit Archery"
+msgstr ""
+
+#: build/trans_presets.java:1970
+msgid "Climbing"
+msgstr ""
+
+#. item "Sport/Climbing"
 #: build/trans_presets.java:1971
-msgid "Archery"
-msgstr ""
-
-#. item "Sport/Archery"
-#: build/trans_presets.java:1972
-msgid "Edit Archery"
-msgstr ""
-
+msgid "Edit Climbing"
+msgstr ""
+
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
 #: build/trans_presets.java:1977
-msgid "Climbing"
-msgstr ""
-
-#. item "Sport/Climbing"
-#: build/trans_presets.java:1978
-msgid "Edit Climbing"
-msgstr ""
-
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr ""
+
+#. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
-msgid "Dog Racing"
-msgstr ""
-
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
-msgid "Edit Dog Racing"
-msgstr ""
-
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
-msgid "Equestrian"
-msgstr ""
-
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
-msgid "Edit Equestrian"
-msgstr ""
-
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
-msgid "Edit Gymnastics"
-msgstr ""
-
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
 #: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
-msgid "Edit Motor Sports"
-msgstr ""
-
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
+msgid "Edit Skateboard"
+msgstr ""
+
+#: build/trans_presets.java:2030
+msgid "Swimming"
+msgstr ""
+
+#. item "Sport/Swimming"
 #: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
-msgid "Edit Skateboard"
-msgstr ""
-
-#: build/trans_presets.java:2037
-msgid "Swimming"
-msgstr ""
-
-#. item "Sport/Swimming"
-#: build/trans_presets.java:2038
 msgid "Edit Swimming"
 msgstr ""
@@ -24865,52 +24803,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:2038
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:2041
+msgid "Piste type"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2041
+msgid "downhill"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "nordic"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "snow_park"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2042
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:2045
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
-msgid "Piste type"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
-msgid "downhill"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "nordic"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "snow_park"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "advanced"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:2052
 msgid "Shooting"
 msgstr ""
@@ -24918,177 +24856,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2047
+msgid "Edit Shooting"
+msgstr ""
+
+#: build/trans_presets.java:2053
+msgid "Sport (Ball)"
+msgstr ""
+
+#. group "Sport (Ball)"
 #: build/trans_presets.java:2054
-msgid "Edit Shooting"
+msgid "Soccer"
+msgstr ""
+
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2055
+msgid "Edit Soccer"
 msgstr ""
 
 #: build/trans_presets.java:2060
-msgid "Sport (Ball)"
-msgstr ""
-
-#. group "Sport (Ball)"
+msgid "Football"
+msgstr ""
+
+#. item "Sport (Ball)/Football"
 #: build/trans_presets.java:2061
-msgid "Soccer"
-msgstr ""
-
-#. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
-msgid "Edit Soccer"
-msgstr ""
-
+msgid "Edit Football"
+msgstr ""
+
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2067
-msgid "Football"
-msgstr ""
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
-msgid "Edit Football"
-msgstr ""
-
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2072
+msgid "Baseball"
+msgstr ""
+
+#. item "Sport (Ball)/Baseball"
 #: build/trans_presets.java:2073
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
-msgid "Edit Australian Football"
-msgstr ""
-
+msgid "Edit Baseball"
+msgstr ""
+
+#: build/trans_presets.java:2078
+msgid "Basketball"
+msgstr ""
+
+#. item "Sport (Ball)/Basketball"
 #: build/trans_presets.java:2079
-msgid "Baseball"
-msgstr ""
-
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
-msgid "Edit Baseball"
-msgstr ""
-
+msgid "Edit Basketball"
+msgstr ""
+
+#: build/trans_presets.java:2084
+msgid "Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf"
 #: build/trans_presets.java:2085
-msgid "Basketball"
-msgstr ""
-
-#. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
-msgid "Edit Basketball"
-msgstr ""
-
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2088
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
 #: build/trans_presets.java:2091
-msgid "Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
-msgid "golf_course"
-msgstr ""
-
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
+msgid "Edit Croquet"
+msgstr ""
+
+#: build/trans_presets.java:2120
+msgid "Hockey"
+msgstr ""
+
+#. item "Sport (Ball)/Hockey"
 #: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
-msgid "Edit Croquet"
-msgstr ""
-
+msgid "Edit Hockey"
+msgstr ""
+
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
 #: build/trans_presets.java:2127
-msgid "Hockey"
-msgstr ""
-
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
-msgid "Edit Hockey"
-msgstr ""
-
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
-msgid "Edit Racquet"
-msgstr ""
-
+msgid "Edit Rugby"
+msgstr ""
+
+#: build/trans_presets.java:2144
+msgid "Table Tennis"
+msgstr ""
+
+#. item "Sport (Ball)/Table Tennis"
 #: build/trans_presets.java:2145
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
-msgid "Edit Rugby"
-msgstr ""
-
+msgid "Edit Table Tennis"
+msgstr ""
+
+#: build/trans_presets.java:2150
+msgid "Tennis"
+msgstr ""
+
+#. item "Sport (Ball)/Tennis"
 #: build/trans_presets.java:2151
-msgid "Table Tennis"
-msgstr ""
-
-#. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
-msgid "Edit Table Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2157
-msgid "Tennis"
-msgstr ""
-
-#. item "Sport (Ball)/Tennis"
+msgid "Edit Tennis"
+msgstr ""
+
 #: build/trans_presets.java:2158
-msgid "Edit Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2165
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr ""
@@ -25096,5 +25034,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr ""
@@ -25102,10 +25040,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr ""
@@ -25113,10 +25051,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr ""
@@ -25124,10 +25062,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr ""
@@ -25136,10 +25074,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr ""
@@ -25148,10 +25086,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr ""
@@ -25161,10 +25099,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr ""
@@ -25173,10 +25111,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr ""
@@ -25184,5 +25122,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -25190,15 +25128,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr ""
@@ -25206,10 +25144,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -25217,10 +25155,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -25228,5 +25166,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -25234,5 +25172,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr ""
@@ -25241,10 +25179,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr ""
@@ -25253,9 +25191,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -25263,10 +25201,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr ""
@@ -25275,10 +25213,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -25288,5 +25226,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -25295,6 +25233,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr ""
@@ -25303,66 +25241,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25371,81 +25309,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr ""
@@ -25454,5 +25392,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr ""
@@ -25460,5 +25398,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -25466,25 +25404,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -25493,5 +25431,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25499,61 +25437,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
+#: build/trans_presets.java:2304
+msgid "Man Made"
+msgstr ""
+
+#. group "Man Made"
+#: build/trans_presets.java:2305
+msgid "Works"
+msgstr ""
+
+#. item "Man Made/Works"
+#: build/trans_presets.java:2306
+msgid "Edit Works"
+msgstr ""
+
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2310
+msgid "Tower"
+msgstr ""
+
+#. item "Man Made/Tower"
 #: build/trans_presets.java:2311
-msgid "Man Made"
-msgstr ""
-
-#. group "Man Made"
-#: build/trans_presets.java:2312
-msgid "Works"
-msgstr ""
-
-#. item "Man Made/Works"
-#: build/trans_presets.java:2313
-msgid "Edit Works"
-msgstr ""
-
-#. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
-msgid "Tower"
-msgstr ""
-
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2318
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25561,25 +25499,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr ""
@@ -25587,10 +25525,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr ""
@@ -25598,10 +25536,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr ""
@@ -25610,41 +25548,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -25654,10 +25592,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -25665,5 +25603,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
@@ -25671,10 +25609,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25682,10 +25620,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -25693,23 +25631,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr ""
@@ -25719,35 +25657,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr ""
@@ -25756,10 +25694,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr ""
@@ -25768,5 +25706,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -25774,10 +25712,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr ""
@@ -25788,23 +25726,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr ""
@@ -25813,74 +25751,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+#: build/trans_presets.java:2423
+msgid "Edit Power Line"
+msgstr ""
+
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2424
+msgid "Line type"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2424
+msgid "line"
+msgstr ""
+
+#: build/trans_presets.java:2424
+msgid "minor_line"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2429
+msgid "Amount of Cables"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Cables"
 #: build/trans_presets.java:2430
-msgid "Edit Power Line"
-msgstr ""
-
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
-msgid "Line type"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
-msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2431
-msgid "minor_line"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
-msgid "Amount of Cables"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
+#: build/trans_presets.java:2434
+msgid "Toilets"
+msgstr ""
+
 #: build/trans_presets.java:2441
-msgid "Toilets"
-msgstr ""
-
-#: build/trans_presets.java:2448
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr ""
@@ -25889,5 +25827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr ""
@@ -25895,5 +25833,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr ""
@@ -25901,5 +25839,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr ""
@@ -25907,5 +25845,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25913,5 +25851,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -25919,15 +25857,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr ""
@@ -25936,5 +25874,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr ""
@@ -25942,35 +25880,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2467
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2470
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2474
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
 msgid "Waste Basket"
 msgstr ""
@@ -25978,5 +25916,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25985,31 +25923,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26088,5 +26026,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26096,31 +26034,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26129,30 +26067,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr ""
@@ -26161,10 +26099,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr ""
@@ -26173,10 +26111,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26185,5 +26123,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26191,5 +26129,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26197,15 +26135,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:2517
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Amenities/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:2523
+msgid "Shops"
+msgstr ""
+
+#. group "Shops"
 #: build/trans_presets.java:2524
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
-msgid "Shops"
-msgstr ""
-
-#. group "Shops"
-#: build/trans_presets.java:2531
 msgid "Car Dealer"
 msgstr ""
@@ -26213,10 +26151,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26225,28 +26163,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr ""
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
 #: build/trans_presets.java:2545
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2551
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2552
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26254,9 +26192,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr ""
@@ -26264,27 +26202,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr ""
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr ""
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
+msgid "Edit Butcher"
 msgstr ""
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr ""
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr ""
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr ""
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr ""
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr ""
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr ""
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr ""
@@ -26292,5 +26444,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr ""
@@ -26298,306 +26450,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "Bicicleta"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr ""
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr ""
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr ""
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr ""
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr ""
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr ""
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr ""
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr ""
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr ""
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr ""
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr ""
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr ""
@@ -26605,14 +26549,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:2744
+msgid "Edit Bank"
+msgstr ""
+
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
+msgid "Automated Teller Machine"
+msgstr ""
+
+#. item "Cash/Bank" check "Automated Teller Machine"
 #: build/trans_presets.java:2751
-msgid "Edit Bank"
-msgstr ""
-
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
-msgid "Automated Teller Machine"
-msgstr ""
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
 msgid "Money Exchange"
 msgstr ""
@@ -26620,5 +26564,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr ""
@@ -26626,15 +26570,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr ""
@@ -26642,18 +26586,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr ""
@@ -26661,5 +26605,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr ""
@@ -26667,9 +26611,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr ""
@@ -26677,10 +26621,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26689,5 +26633,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26696,20 +26640,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26717,5 +26661,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr ""
@@ -26724,64 +26668,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+#: build/trans_presets.java:2809
+msgid "Edit Veterinary"
+msgstr ""
+
 #: build/trans_presets.java:2816
-msgid "Edit Veterinary"
-msgstr ""
-
-#: build/trans_presets.java:2823
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
+#: build/trans_presets.java:2818
+msgid "Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2819
+msgid "Edit Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2824
+msgid "Country"
+msgstr ""
+
+#. item "Geography/Places/Country"
 #: build/trans_presets.java:2825
-msgid "Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
-msgid "Edit Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent" text "Name"
+msgid "Edit Country"
+msgstr ""
+
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2830
+msgid "State"
+msgstr ""
+
+#. item "Geography/Places/State"
 #: build/trans_presets.java:2831
-msgid "Country"
-msgstr ""
-
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
-msgid "Edit Country"
-msgstr ""
-
-#. item "Geography/Places/Country" text "Name"
+msgid "Edit State"
+msgstr ""
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2836
+msgid "Region"
+msgstr ""
+
+#. item "Geography/Places/Region"
 #: build/trans_presets.java:2837
-msgid "State"
-msgstr ""
-
-#. item "Geography/Places/State"
-#: build/trans_presets.java:2838
-msgid "Edit State"
-msgstr ""
-
-#. item "Geography/Places/State" text "Name"
+msgid "Edit Region"
+msgstr ""
+
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2842
+msgid "County"
+msgstr ""
+
+#. item "Geography/Places/County"
 #: build/trans_presets.java:2843
-msgid "Region"
-msgstr ""
-
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
-msgid "Edit Region"
-msgstr ""
-
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
-msgid "County"
-msgstr ""
-
-#. item "Geography/Places/County"
-#: build/trans_presets.java:2850
 msgid "Edit County"
 msgstr ""
@@ -26789,15 +26733,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr ""
@@ -26805,10 +26749,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr ""
@@ -26816,25 +26760,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2869
+msgid "Village"
+msgstr ""
+
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2870
+msgid "Edit Village"
+msgstr ""
+
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2875
+msgid "Hamlet"
+msgstr ""
+
+#. item "Geography/Places/Hamlet"
 #: build/trans_presets.java:2876
-msgid "Village"
-msgstr ""
-
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
-msgid "Edit Village"
-msgstr ""
-
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
-msgid "Hamlet"
-msgstr ""
-
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
 msgid "Edit Hamlet"
 msgstr ""
@@ -26842,5 +26786,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26848,10 +26792,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr ""
@@ -26859,10 +26803,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26870,5 +26814,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26876,5 +26820,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr ""
@@ -26882,10 +26826,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr ""
@@ -26893,10 +26837,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr ""
@@ -26904,10 +26848,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr ""
@@ -26915,70 +26859,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:2926
+msgid "Edit Volcano"
+msgstr ""
+
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2932
+msgid "Boundaries"
+msgstr ""
+
+#. group "Boundaries"
 #: build/trans_presets.java:2933
-msgid "Edit Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano" text "Elevation"
+msgid "National"
+msgstr ""
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2934
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Boundaries/National" text "Name"
 #: build/trans_presets.java:2939
-msgid "Boundaries"
-msgstr ""
-
-#. group "Boundaries"
+msgid "Administrative"
+msgstr ""
+
+#. item "Boundaries/Administrative"
 #: build/trans_presets.java:2940
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:2941
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
 #: build/trans_presets.java:2946
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2957
+msgid "National park"
+msgstr ""
+
+#. item "Boundaries/National park"
 #: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Boundaries/National park" text "Name"
 #: build/trans_presets.java:2964
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
+msgid "Land use"
+msgstr ""
+
+#. group "Land use"
 #: build/trans_presets.java:2965
-msgid "Edit National Park Boundary"
-msgstr ""
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
-msgid "Land use"
-msgstr ""
-
-#. group "Land use"
-#: build/trans_presets.java:2972
 msgid "Tree"
 msgstr ""
@@ -26987,15 +26931,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:2968
+msgid "Edit Tree"
+msgstr ""
+
+#. item "Land use/Tree" text "Height"
+#: build/trans_presets.java:2973
+msgid "Botanical Name"
+msgstr ""
+
+#. item "Land use/Tree" text "Botanical Name"
 #: build/trans_presets.java:2975
-msgid "Edit Tree"
-msgstr ""
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
-msgid "Botanical Name"
-msgstr ""
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
 msgid "Wood"
 msgstr ""
@@ -27004,5 +26948,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr ""
@@ -27010,17 +26954,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr ""
@@ -27029,14 +26973,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:2986
+msgid "Edit Forest Landuse"
+msgstr ""
+
+#: build/trans_presets.java:2992
+msgid "Nature Reserve"
+msgstr ""
+
+#. item "Land use/Nature Reserve"
 #: build/trans_presets.java:2993
-msgid "Edit Forest Landuse"
-msgstr ""
-
-#: build/trans_presets.java:2999
-msgid "Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -27044,25 +26988,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -27070,10 +27014,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -27081,5 +27025,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -27087,5 +27031,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -27094,45 +27038,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr ""
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr ""
+
+#. item "Land use/Meadow"
 #: build/trans_presets.java:3036
-msgid "Farmland"
-msgstr ""
-
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3037
-msgid "Edit Farmland Landuse"
-msgstr ""
-
-#. item "Land use/Farmland" text "Name"
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3041
+msgid "Vineyard"
+msgstr ""
+
+#. item "Land use/Vineyard"
 #: build/trans_presets.java:3042
-msgid "Meadow"
-msgstr ""
-
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3043
-msgid "Edit Meadow Landuse"
-msgstr ""
-
-#. item "Land use/Meadow" text "Name"
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3047
+msgid "Allotments"
+msgstr ""
+
+#. item "Land use/Allotments"
 #: build/trans_presets.java:3048
-msgid "Vineyard"
-msgstr ""
-
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
-msgid "Edit Vineyard Landuse"
-msgstr ""
-
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
-msgid "Allotments"
-msgstr ""
-
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3055
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27140,25 +27084,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27166,10 +27110,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27177,20 +27121,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27198,5 +27142,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27204,15 +27148,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr ""
@@ -27220,9 +27164,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr ""
@@ -27230,39 +27174,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
 #: build/trans_presets.java:3114
-msgid "Edit Cemetery Landuse"
-msgstr ""
-
+msgid "Retail"
+msgstr ""
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
 #: build/trans_presets.java:3121
-msgid "Retail"
-msgstr ""
-
-#. item "Land use/Retail"
-#: build/trans_presets.java:3122
-msgid "Edit Retail Landuse"
-msgstr ""
-
-#. item "Land use/Retail" text "Name"
+msgid "Edit Commercial Landuse"
+msgstr ""
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:3126
+msgid "Industrial"
+msgstr ""
+
+#. item "Land use/Industrial"
 #: build/trans_presets.java:3127
-msgid "Commercial"
-msgstr ""
-
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3128
-msgid "Edit Commercial Landuse"
-msgstr ""
-
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
-msgid "Industrial"
-msgstr ""
-
-#. item "Land use/Industrial"
-#: build/trans_presets.java:3134
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27270,15 +27214,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27286,50 +27230,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
+#: build/trans_presets.java:3146
+msgid "Construction area"
+msgstr ""
+
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3147
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
 #: build/trans_presets.java:3153
-msgid "Construction area"
-msgstr ""
-
-#. item "Land use/Construction area"
-#: build/trans_presets.java:3154
-msgid "Edit Construction Landuse"
-msgstr ""
-
-#. item "Land use/Construction area" text "Name"
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3170
+msgid "Quarry"
+msgstr ""
+
+#. item "Land use/Quarry"
 #: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
-msgid "Edit Landfill Landuse"
-msgstr ""
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
-msgid "Quarry"
-msgstr ""
-
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3178
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27339,5 +27283,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27346,10 +27290,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27357,5 +27301,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27364,5 +27308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27370,34 +27314,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27406,15 +27350,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27422,5 +27366,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27429,5 +27373,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27435,5 +27379,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27524,5 +27468,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27532,17 +27476,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27602,5 +27546,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27609,9 +27553,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27625,10 +27569,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27636,31 +27580,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27669,31 +27613,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/he.po
===================================================================
--- /applications/editors/josm/i18n/po/he.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/he.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 19:38+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 19:08+0000\n"
 "Last-Translator: Ilan <ilan@fonz.net>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:45+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1189,5 +1189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "לא ניתן להזיז פריטים אל מחוץ לעולם."
@@ -1500,5 +1500,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2243,9 +2243,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2328,26 +2328,26 @@
 msgstr "הפסק לצייר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "הוצאה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "צור אזורים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "הבלטת דרך"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "צייר מרובע בגודל הרצוי, ואז שחרר את לחצן העכבר."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2367,6 +2367,6 @@
 "לסנכרון השמע בנקודה זו."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2378,9 +2378,9 @@
 msgstr "בחר"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "בחר, הזז והטה פריטים"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2389,17 +2389,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2409,19 +2409,19 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "שחרר את לחצן העכבר לבחירת פריטים במרובע."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"שחרר את לחצן העכבר הימני להפסקת ההזזה. Ctrl למיזוג עם הצומת הקרוב ביותר."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "שחרר את סמן העכבר להפסקת ההטייה"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3145,5 +3145,5 @@
 msgstr "החל?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3713,17 +3713,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "סטנדרטי"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "לא מחובר"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "תמונות שעדיין לא תויגו"
+msgstr ""
 
 #. teal
@@ -3904,5 +3901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "מסילת רכבת"
@@ -5191,5 +5188,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "הכל"
@@ -5604,4 +5601,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5692,5 +5694,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "יחסים"
@@ -5792,14 +5794,14 @@
 msgstr "בחירה: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "\"שחרר\" את הפאנל"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "סגור את הפאנל. ניתן לפתוח אותו מחדש בעזרת הכפתורים בסרגל הכלים השמאלי."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "לחץ כדי למזער \\ למקסם את תוכן הפאנל"
@@ -6129,4 +6131,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6139,10 +6147,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6812,145 +6814,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "שם"
@@ -8164,10 +8166,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "סוג"
@@ -8175,5 +8177,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8187,17 +8188,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "לא ידוע"
@@ -8962,11 +8962,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8983,14 +8985,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "שכבה"
@@ -9523,5 +9525,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "תיאור"
@@ -10584,55 +10586,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11105,5 +11107,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "רכב"
@@ -11125,16 +11127,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "אופניים"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11164,12 +11167,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "רגל"
@@ -11865,12 +11868,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "שם רחוב"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "ערכים נמדדים"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14118,6 +14119,7 @@
 msgstr ""
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14208,5 +14210,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14393,5 +14395,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14432,19 +14434,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "מבנים"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14452,5 +14454,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14463,10 +14465,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14649,5 +14651,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16469,5 +16471,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "תחבורה ציבורית"
@@ -16519,5 +16521,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "ציון דרך"
@@ -17090,4 +17092,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "סוג"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17244,4 +17263,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "מחק את היחס הנבחר"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17998,5 +18030,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19270,7 +19302,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "התייחסות"
@@ -19287,5 +19319,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "מסלולים"
@@ -19303,4 +19335,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19308,9 +19341,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "מהירות מירבית (קמ\"ש)"
@@ -19338,15 +19370,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19357,11 +19383,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "חד סטרי"
@@ -19381,15 +19406,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19406,11 +19429,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19431,8 +19454,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19450,11 +19473,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "מנהרה"
@@ -19474,6 +19497,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19491,11 +19514,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19515,6 +19538,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19532,11 +19555,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19674,5 +19697,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19681,12 +19704,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19694,13 +19720,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19729,24 +19755,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "שטח פנים"
@@ -19758,5 +19780,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19770,11 +19792,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "סלול"
@@ -19782,10 +19803,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "לא סלול"
@@ -19793,10 +19814,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19804,11 +19825,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19816,10 +19836,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19827,10 +19847,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr ""
@@ -19838,10 +19858,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19849,11 +19869,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "אבני ריצוף"
@@ -19861,10 +19880,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "חצץ"
@@ -19872,10 +19891,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19883,10 +19902,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19894,10 +19913,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19905,10 +19924,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "דשא"
@@ -19916,10 +19935,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "חול"
@@ -19927,10 +19946,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "אדמה"
@@ -20011,6 +20030,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "כביש (סוג לא ידוע)"
@@ -20019,5 +20037,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "ערוך כביש מסוג לא ידוע"
@@ -20025,6 +20043,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "בנייה"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "ערוך דרך מהירה בבנייה"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "צומת"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "כיכר"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "הגבלות דרך"
@@ -20033,15 +20080,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "ערוך הגבלות דרך"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "אגרה"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "דרך ללא מוצא"
@@ -20049,5 +20096,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "גישה"
@@ -20089,28 +20136,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "כן"
@@ -20123,10 +20169,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20140,10 +20186,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20167,97 +20213,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "חקלאי"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "לא"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20272,10 +20318,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "סוס"
@@ -20291,10 +20337,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "אופנוע"
@@ -20309,19 +20355,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "רכב ציבורי"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "מהירות מינימלית (קמ\"ש)"
@@ -20329,20 +20375,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "משקל מירבי (טונות)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20350,5 +20396,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "כיכר"
@@ -20359,5 +20405,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "ערוך צומת"
@@ -20377,10 +20423,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20402,10 +20448,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20427,10 +20473,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "ראשי"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20452,5 +20498,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20465,9 +20511,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "שלישוני"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20481,9 +20527,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "מגורים"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20513,10 +20559,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "שירות"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20546,5 +20592,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20556,10 +20602,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "ערוך גשר"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20567,39 +20613,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "דרכים"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "בנייה"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "ערוך דרך מהירה בבנייה"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "צומת"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "כיכר"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20608,73 +20625,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "נתיב"
@@ -20683,38 +20668,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "ערוך נתיב"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "סקי"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "רכב שלג"
@@ -20723,5 +20738,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20729,5 +20744,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20735,5 +20750,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20751,11 +20766,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "ערוך שביל אופניים"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20763,5 +20778,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20769,5 +20784,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20775,5 +20790,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20782,15 +20797,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "ערוך שביל להולכי רגל"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "מדרגות"
@@ -20800,10 +20811,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "ערוך גרם מדרגות"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr ""
@@ -20811,15 +20822,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "מספר"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "שירותים"
@@ -20827,5 +20838,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "ערוך תחנת שירות"
@@ -20865,17 +20876,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "מפעיל"
@@ -20884,5 +20895,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "רמזור"
@@ -20892,5 +20903,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "סוג מעבר חציה"
@@ -20899,27 +20910,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "אי"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20927,6 +20938,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20935,11 +20946,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20947,30 +20958,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "זברה"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "שקנאי"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "עצור"
@@ -20978,5 +20989,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "מעבר חציה"
@@ -20985,14 +20996,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21000,33 +21011,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21034,5 +21045,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21040,5 +21051,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21049,14 +21060,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21066,5 +21077,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "תחום עיר"
@@ -21072,15 +21083,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "ערוך שלט תחום עיר"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "שם שני"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "מצלמת מהירות"
@@ -21089,5 +21100,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "טלפון חירום"
@@ -21095,5 +21106,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21101,5 +21112,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21107,5 +21118,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21115,10 +21126,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "אזור צליחה"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "ערוך אזור צליחה"
@@ -21126,5 +21137,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "מעבר הרים"
@@ -21132,5 +21143,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "ערוך מעבר הרים"
@@ -21142,7 +21153,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "הגבהה"
@@ -21150,5 +21161,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "מחסומים"
@@ -21156,5 +21167,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21162,5 +21173,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21205,16 +21216,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "תנועה מותרת:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21223,5 +21234,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "מחסום"
@@ -21229,5 +21240,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21235,10 +21246,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21246,15 +21257,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "דוקרנים"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "ערוך דוקרנים"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "תא אגרה"
@@ -21262,5 +21273,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "ערוך תא אגרה"
@@ -21268,10 +21279,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "ביקורת גבולות"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "ערוך ביקורת גבולות"
@@ -21281,5 +21292,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21290,22 +21301,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "חומה"
@@ -21313,5 +21324,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "חומת עיר"
@@ -21320,5 +21331,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21330,10 +21341,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "כניסה"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "ערוך כניסה"
@@ -21341,5 +21352,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "שער"
@@ -21347,50 +21358,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "ערוך שער"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21398,25 +21409,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21427,11 +21438,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "מים"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "מעיין"
@@ -21439,5 +21450,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "ערוך מעיין"
@@ -21445,5 +21456,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21451,10 +21462,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21462,10 +21473,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "נחל"
@@ -21473,10 +21484,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "ערוך נחל"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "תעלה"
@@ -21484,10 +21495,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "ערוך תעלה"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "נהר"
@@ -21497,5 +21508,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "ערוך נהר"
@@ -21503,15 +21514,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "ערוך מים"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "אדמה"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "ערוך אדמה"
@@ -21519,15 +21530,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21535,15 +21546,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21551,5 +21562,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "גדת נחל"
@@ -21558,10 +21569,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "ערוך גדת נחל"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21572,14 +21583,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "אדמה בוצית"
@@ -21593,35 +21604,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "ביצה"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "מצע קנה-סוף"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "ביצה מלוחה"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "מנגרוב"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "בוץ"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "ערוך בוץ"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "חוף"
@@ -21629,20 +21640,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "ערוך חוף"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "מפרץ"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "ערוך מפרץ"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "צוק"
@@ -21650,10 +21661,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "ערוך צוק"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "קו חוף"
@@ -21661,5 +21672,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "ערוך קו חוף"
@@ -21667,5 +21678,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "נתיב מעבורת"
@@ -21673,5 +21684,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "ערוך מעבורת"
@@ -21680,5 +21691,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "מספנה"
@@ -21686,10 +21697,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "ערוך מספנה"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -21697,5 +21708,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21703,5 +21714,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr ""
@@ -21709,15 +21720,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
 #: build/trans_presets.java:1097
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1104
 msgid "Lock Gate"
 msgstr ""
@@ -21726,5 +21737,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21732,20 +21743,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21754,15 +21765,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr ""
@@ -21770,10 +21781,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21781,10 +21792,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21794,20 +21805,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -21815,5 +21826,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -21843,86 +21854,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "סטנדרטי"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21934,8 +21870,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21949,29 +21885,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21984,8 +21920,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22056,8 +21992,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22069,8 +22005,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr ""
@@ -22083,8 +22019,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22097,23 +22033,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22121,50 +22057,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "רכבת קלה"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "ערוך רכבת קלה"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "רכבת תחתית"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "ערוך רכבת תחתית"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22172,5 +22108,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22179,10 +22115,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22191,9 +22127,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22202,5 +22138,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22209,5 +22145,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22217,5 +22153,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22223,5 +22159,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22230,5 +22166,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22237,10 +22173,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22248,10 +22184,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22259,10 +22195,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22270,10 +22206,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22281,10 +22217,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22293,5 +22229,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22299,5 +22235,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22306,5 +22242,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22312,5 +22248,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "דלק"
@@ -22320,62 +22256,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "ערוך דלק"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22433,32 +22369,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "שעות פתיחה"
@@ -22517,165 +22453,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22692,5 +22628,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22700,5 +22636,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr ""
@@ -22709,25 +22645,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22736,48 +22672,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "שטיפה"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "ערוך שטיפת רכב"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "תיקונים"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "ערוך תיקוני רכבים"
@@ -22785,5 +22721,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "השכרה"
@@ -22792,10 +22728,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "ערוך השכרת רכב"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "שיתוף"
@@ -22803,5 +22739,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "ערוך שיתוף רכבים"
@@ -22809,10 +22745,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22821,10 +22757,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "ערוך השכרת אופניים"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22834,5 +22770,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22840,5 +22776,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22846,5 +22782,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22852,5 +22788,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22858,5 +22794,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22865,5 +22801,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22871,5 +22807,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22878,5 +22814,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22888,5 +22824,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22894,10 +22830,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "כניסת רכבת תחתית"
@@ -22906,10 +22842,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "ערוך כניסת רכבת תחתית"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -22918,5 +22854,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "תחנת אוטובוס"
@@ -22925,5 +22861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "ערוך תחנת אוטובוס"
@@ -22931,5 +22867,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr ""
@@ -22939,5 +22875,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr ""
@@ -22946,6 +22882,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "מקלט"
@@ -22953,19 +22889,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "ספסל"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -22973,5 +22909,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "מונית"
@@ -22979,5 +22915,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "ערוך תחנת מוניות"
@@ -22985,10 +22921,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "שדה תעופה"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22996,5 +22932,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23002,10 +22938,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -23014,5 +22950,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23020,5 +22956,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23026,5 +22962,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23032,5 +22968,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23038,5 +22974,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23044,5 +22980,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23052,5 +22988,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23060,5 +22996,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23069,6 +23005,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23078,5 +23014,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23085,5 +23021,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23091,5 +23027,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23097,15 +23033,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "לינה"
@@ -23117,5 +23053,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "מלון"
@@ -23124,15 +23060,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23140,20 +23076,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23161,10 +23097,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23172,30 +23108,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
@@ -23203,10 +23139,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "מזון ושתיה"
@@ -23217,5 +23153,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "מסעדה"
@@ -23223,5 +23159,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -23229,5 +23165,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23235,73 +23171,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "קבב"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "תורכי"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "אסייתי"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "תאילנדי"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "מקסיקני"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "יפני"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "מזון מהיר"
@@ -23309,17 +23245,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "ערוך מסעדת מזון מהיר"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "בית קפה"
@@ -23327,9 +23263,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "ערוך בית קפה"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "פאב"
@@ -23337,18 +23273,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "ערוך פאב"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "בר"
@@ -23356,9 +23292,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "ערוך בר"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "מועדון לילה"
@@ -23366,24 +23302,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "ערוך מועדון לילה"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "תיירות"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "מוזיאון"
@@ -23391,9 +23327,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "ערוך מוזיאון"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "גן חיות"
@@ -23402,9 +23338,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "ערוך גן חיות"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "נקודת תצפית"
@@ -23412,24 +23348,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "ערוך נקודת תצפית"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "מגדל תצפית"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "פארק שעשועים"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "ערוך פארק שעשועים"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "יצירת אומנות"
@@ -23437,5 +23373,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "ערוך יצירת אומנות"
@@ -23443,19 +23379,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "מפה"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23493,5 +23429,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23499,28 +23435,28 @@
 msgstr "רחוב"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23530,5 +23466,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23536,5 +23472,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "צעידה"
@@ -23542,6 +23478,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "רכיבה"
@@ -23549,5 +23485,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23555,6 +23491,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "סקי"
@@ -23562,5 +23498,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23568,46 +23504,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "היסטוריה"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "טבע"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23615,29 +23551,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "ערוך מקלט"
@@ -23645,25 +23581,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "אתר פיקניק"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "ערוך אתר פיקניק"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "מקומות היסטורים"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "טירה"
@@ -23672,19 +23608,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "ערוך טירה"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "חורבות"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "ערוך חורבות"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "אתר ארכיאולוגי"
@@ -23693,9 +23629,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "ערוך אתר ארכיאולוגי"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "שדה קרב"
@@ -23703,10 +23639,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "ערוך שדה קרב"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23714,5 +23650,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23720,15 +23656,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "אנדרטה"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "ערוך אנדרטה"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "מצבת זיכרון"
@@ -23736,55 +23672,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "ערוך מצבת זיכרון"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "פנאי"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "פארק מים"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "ערוך פארק מים"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "מגרש משחקים"
@@ -23792,35 +23728,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "ערוך מגרש משחקים"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "דייג"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "ערוך דייג"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "מתקני ספורט"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "איצטדיון"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "ערוך איצטדיון"
@@ -23834,6 +23770,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "בחר ענף ספורט:"
@@ -24225,6 +24161,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24258,225 +24194,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "קשתות"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "אתלטיקה"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "כדורגל אוסטרלי"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "כדור בסיס"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "כדורסל"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "כדורת דשא"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "קנו"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "טיפוס"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "קריקט"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "מירוץ כלבים"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "כדורגל אמריקאי"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "גולף"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "התעמלות"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "הוקי"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "מירוץ סוסים"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "רוגבי"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "סקייטבורד"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "סקייטים"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "סקי"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "כדורגל"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "שחייה"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "טניס שולחן"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "טניס"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "מרכז ספורט"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "ערוך מרכז ספורט"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "מסלול מירוצים"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "ערוך מסלול מירוצים"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "מגרש גולף"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "ערוך מגרש גולף"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "מיני-גולף"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "ערוך מיני-גולף"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "ספורט"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24515,21 +24451,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "סוג"
@@ -24568,203 +24504,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "מרכז ספורט"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "איצטדיון"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "אתלטיקה"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "ערוך אתלטיקה"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "קשתות"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "ערוך קשתות"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "טיפוס"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "ערוך טיפוס"
 
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr "ערוך רכיבה"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "מירוץ כלבים"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "ערוך מירוץ כלבים"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "מירוץ סוסים"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "ערוך מירוץ סוסים"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "התעמלות"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "ערוך התעמלות"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "ספורט מוטורי"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "ערוך ספורט מוטורי"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr ""
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "סקייטבורד"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "ערוך סקייטבורד"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "שחייה"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "ערוך שחייה"
@@ -24772,52 +24708,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "ערוך סקי"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "סוג מסלול"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "גלישה במורד"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "פארק שלג"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "קושי"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "מתחילים"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "קל"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "מקצוענים"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "ירי"
@@ -24825,177 +24761,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "ערוך ירי"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "ספורט (משחקי כדור)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "כדורגל"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "ערוך כדורגל"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "כדורגל אמריקאי"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "ערוך כדורגל אמריקאי"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "כדורגל אוסטרלי"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "ערוך כדורגל אוסטרלי"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "כדור בסיס"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "ערוך כדור בסיס"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "כדורסל"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "ערוך כדורסל"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "גולף"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "ערוך גולף"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "מגרש גולף"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "כדורת דשא"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "ערוך כדורת דשא"
 
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2103
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "הוקי"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "ערוך הוקי"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "רוגבי"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "ערוך רוגבי"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "טניס שולחן"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "ערוך טניס שולחן"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "טניס"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "ערוך טניס"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "מבנה"
@@ -25003,5 +24939,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "מבנה ציבור"
@@ -25009,10 +24945,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "ערוך מבנה ציבור"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "בניין העירייה"
@@ -25020,10 +24956,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "ערוך בניין העירייה"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "שגרירות"
@@ -25031,10 +24967,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "ערוך שגרירות"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "בית משפט"
@@ -25043,10 +24979,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "ערוך בית משפט"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "כלא"
@@ -25055,10 +24991,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "ערוך כלא"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "משטרה"
@@ -25068,10 +25004,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "ערוך משטרה"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "תחנת מכבי אש"
@@ -25080,10 +25016,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "ערוך תחנת מכבי אש"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "דואר"
@@ -25091,5 +25027,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "ערוך דואר"
@@ -25097,15 +25033,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "ערוך גן ילדים"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "בית ספר"
@@ -25113,10 +25049,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "ערוך בית ספר"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "אוניברסיטה"
@@ -25124,10 +25060,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "ערוך אוניברסיטה"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "מכללה"
@@ -25135,5 +25071,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "ערוך מכללה"
@@ -25141,5 +25077,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "קולנוע"
@@ -25148,10 +25084,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "ערוך קולנוע"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "ספרייה"
@@ -25160,9 +25096,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "ערוך ספרייה"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "מרכז אומנויות"
@@ -25170,10 +25106,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "ערוך מרכז אומנויות"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "תיאטרון"
@@ -25182,10 +25118,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "ערוך תיאטרון"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "מקום תפילה"
@@ -25195,5 +25131,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "ערוך מקום תפילה"
@@ -25202,6 +25138,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "דת"
@@ -25210,66 +25146,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "בהאי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "בודהיסט"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "נוצרי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "הינדי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "יהודי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "מוסלמי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "סיקי"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "ספיריטואליסט"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "טאואיסט"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25278,81 +25214,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "אנגליקני"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "באפטיסט"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "קתולי"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "לותרני"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "מתודיסט"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "מורמוני"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "אורתודוקסי"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "פרוטסטנטי"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "שיעי"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "סוני"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "כתובות"
@@ -25361,5 +25297,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "ערוך כתובת"
@@ -25367,5 +25303,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "מספר בית"
@@ -25373,25 +25309,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "שם בית"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "שם רחוב"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "שם עיר"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "מיקוד"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "קוד מדינה"
@@ -25400,5 +25336,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25406,61 +25342,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "סכמת מספור"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "אי-זוגי"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "זוגי"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "מעשה אדם"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "מגדל"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "ערוך מגדל"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25468,25 +25404,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "מגדל מים"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "ערוך מגדל מים"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "מגדלור"
@@ -25494,10 +25430,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "ערוך מגדלור"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "טחנת רוח"
@@ -25505,10 +25441,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "ערוך טחנת רוח"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "צינור"
@@ -25517,41 +25453,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "ערוך צינור"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "מיקום"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -25561,10 +25497,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -25572,5 +25508,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
@@ -25578,10 +25514,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25589,10 +25525,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -25600,23 +25536,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr ""
@@ -25626,35 +25562,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "תחנת כח"
@@ -25663,10 +25599,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "ערוך תחנת כח"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr ""
@@ -25675,5 +25611,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -25681,10 +25617,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "עמוד חשמל"
@@ -25695,23 +25631,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "ערוך עמוד חשמל"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "קו מתח"
@@ -25720,74 +25656,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "ערוך קו מתח"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "שירותים"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "תיבת דואר"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "טלפון"
@@ -25796,5 +25732,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "ערוך טלפון"
@@ -25802,5 +25738,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr ""
@@ -25808,5 +25744,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr ""
@@ -25814,5 +25750,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25820,5 +25756,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -25826,15 +25762,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "כרטיסי טלפון"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr ""
@@ -25843,5 +25779,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "ערוך תחנת מיחזור"
@@ -25849,35 +25785,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2467
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2470
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2474
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
 msgid "Waste Basket"
 msgstr ""
@@ -25885,5 +25821,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25892,31 +25828,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -25995,5 +25931,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26003,31 +25939,31 @@
 msgstr "ירוק"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26036,30 +25972,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "מזרקה"
@@ -26068,10 +26004,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "ערוך מזרקה"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "מי שתיה"
@@ -26080,10 +26016,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "ערוך מי שתיה"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26092,5 +26028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26098,5 +26034,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26104,15 +26040,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "חנויות"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26120,10 +26056,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "ערוך חנות רכב"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26132,28 +26068,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "ערוך חנות אופניים"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "סופרמרקט"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "ערוך סופרמרקט"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "מכולת"
@@ -26161,9 +26097,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "ערוך מכולת"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "קיוסק"
@@ -26171,27 +26107,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "ערוך קיוסק"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "קצבייה"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "ערוך קצבייה"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "מאפייה"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "ערוך מאפייה"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "פרחים"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "ערוך חנות פרחים"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "ערוך חנות אורגנית"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "ערוך חנות מחשבים"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "ערוך חנות אלקטרוניקה"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "ערוך חנות רהיטים"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "חנות עשה-זאת-בעצמך"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "ערוך חנות עשה-זאת-בעצמך"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "מספרה"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "ערוך מספרה"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "ערוך חנות נעליים"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "ערוך חנות צעצועים"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "ערוך חנות וידאו"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "ניקוי יבש"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "ערוך ניקוי יבש"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "מכבסה"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "ערוך מכבסה"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "ערוך חנות ספורט"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "ערוך אופטיקאי"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "מכונת ממכר"
@@ -26199,5 +26349,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "ערוך מכונת ממכר"
@@ -26205,306 +26355,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "כרטיסים לתחבורה ציבורית"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "מפות תחבורה ציבורית"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "כרטיסי חניה"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "מזון"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "משקאות"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "ממתקים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "סיגריות"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "תמונות"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "מזון בע\"ח"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "עיתונים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "צעצועים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "בולים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "כרטיס SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "שוברי טלפון"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "שוברים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "אופניים"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "קונדומים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "טמפונים"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "שקיות צואה"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "קצבייה"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "ערוך קצבייה"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "מאפייה"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "ערוך מאפייה"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "פרחים"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "ערוך חנות פרחים"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "ערוך חנות אורגנית"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "ערוך חנות מחשבים"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "ערוך חנות אלקטרוניקה"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "ערוך חנות רהיטים"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "חנות עשה-זאת-בעצמך"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "ערוך חנות עשה-זאת-בעצמך"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "מספרה"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "ערוך מספרה"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "ערוך חנות נעליים"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "ערוך חנות צעצועים"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "ערוך חנות וידאו"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "ניקוי יבש"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "ערוך ניקוי יבש"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "מכבסה"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "ערוך מכבסה"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "ערוך חנות ספורט"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "ערוך אופטיקאי"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "מזומן"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "בנק"
@@ -26512,14 +26454,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "ערוך בנק"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "כספומט"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "החלפת כסף"
@@ -26527,5 +26469,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "ערוך החלפת כסף"
@@ -26533,15 +26475,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "ערוך כספומט"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "בריאות"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "רופאים"
@@ -26549,18 +26491,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "ערוך רופאים"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "רופא שיניים"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "ערוך רופא שיניים"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "בית מרקחת"
@@ -26568,5 +26510,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "ערוך בית מרקחת"
@@ -26574,9 +26516,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "בית חולים"
@@ -26584,10 +26526,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "ערוך בית חולים"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "נקודת גישה בחירום"
@@ -26596,5 +26538,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "ערוך נקודת גישה בחירום"
@@ -26603,20 +26545,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "מספר נקודה"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "מספר טלפון"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(השתמש בקדומת בינלאומית, למשל +12-345-67890)"
@@ -26624,5 +26566,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "וטרינרי"
@@ -26631,64 +26573,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "ערוך וטרינרי"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "מקומות"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "יבשת"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "ערוך יבשת"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "ארץ"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "ערוך ארץ"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "מדינה"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "ערוך מדינה"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "אזור"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "ערוך אזור"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "מחוז"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "ערוך מחוז"
@@ -26696,15 +26638,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "עיר"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "ערוך עיר"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "עיירה"
@@ -26712,10 +26654,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "ערוך עיירה"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "פרבר"
@@ -26723,25 +26665,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "ערוך פרבר"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "כפר"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "ערוך כפר"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "כפר קטן"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "ערוך כפר קטן"
@@ -26749,5 +26691,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "מקומיות"
@@ -26755,10 +26697,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "ערוך מקומיות"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "אי"
@@ -26766,10 +26708,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "ערוך אי"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26777,5 +26719,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26783,5 +26725,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "פתח מערה"
@@ -26789,10 +26731,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "ערוך פתח מערה"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "פסגה"
@@ -26800,10 +26742,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "ערוך פסגה"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "קרחון"
@@ -26811,10 +26753,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "ערוך קרחון"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "הר געש"
@@ -26822,70 +26764,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "ערוך הר געש"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "גבולות"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "לאומי"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "ערוך גבול לאומי"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "מנהלי"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "ערוך גבול מנהלי"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "אזרחי"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "ערוך תחום אזרחי"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "פוליטי"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "ערוך תחום פוליטי"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "גן לאומי"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "ערוך תחום גן לאומי"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr ""
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "עץ"
@@ -26894,15 +26836,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "ערוך עץ"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "שם בוטני"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "חורש"
@@ -26911,5 +26853,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "ערוך חורש"
@@ -26917,17 +26859,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "מחטני"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "נשיר"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "מעורב"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "יער"
@@ -26936,14 +26878,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:2986
+msgid "Edit Forest Landuse"
+msgstr ""
+
+#: build/trans_presets.java:2992
+msgid "Nature Reserve"
+msgstr ""
+
+#. item "Land use/Nature Reserve"
 #: build/trans_presets.java:2993
-msgid "Edit Forest Landuse"
-msgstr ""
-
-#: build/trans_presets.java:2999
-msgid "Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -26951,25 +26893,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -26977,10 +26919,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "שדה-בור"
@@ -26988,5 +26930,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "ערוך שדה-בור"
@@ -26994,5 +26936,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "חצר משק"
@@ -27001,45 +26943,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "אדמה חקלאית"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr ""
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "כרם"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr ""
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27047,25 +26989,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "דשא"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27073,10 +27015,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27084,20 +27026,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27105,5 +27047,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27111,15 +27053,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "אזור מגורים"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "בית-קברות"
@@ -27127,9 +27069,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "ערוך בית-קברות"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "בית עלמין"
@@ -27137,39 +27079,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
 #: build/trans_presets.java:3114
-msgid "Edit Cemetery Landuse"
-msgstr ""
-
-#: build/trans_presets.java:3121
 msgid "Retail"
 msgstr "קמעוני"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr ""
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "מסחרי"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "תעשייתי"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27177,15 +27119,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "צבאי"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27193,50 +27135,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "אתר בניה"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "מחצבה"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27246,5 +27188,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27253,10 +27195,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27264,5 +27206,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27271,5 +27213,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27277,34 +27219,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27313,15 +27255,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27329,5 +27271,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27336,5 +27278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27342,5 +27284,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27431,5 +27373,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27439,17 +27381,17 @@
 msgstr "אופניים"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "אוטובוס"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27509,5 +27451,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27516,9 +27458,9 @@
 msgstr "רגל"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27532,10 +27474,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "רכבת תחתית"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27543,31 +27485,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27576,32 +27518,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "סטנדרטי"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/is.po
===================================================================
--- /applications/editors/josm/i18n/po/is.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/is.po	(revision 20945)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
 "PO-Revision-Date: 2010-01-31 17:21+0000\n"
 "Last-Translator: Ævar Arnfjörð Bjarmason <avarab@gmail.com>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1189,5 +1189,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr ""
@@ -1500,5 +1500,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2250,9 +2250,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2333,26 +2333,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Búa til svæði"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2370,6 +2370,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2381,9 +2381,9 @@
 msgstr "Val"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Velja, færa og snúa hlutum"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2392,17 +2392,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Færa þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Ekki færa þá"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2412,18 +2412,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
-msgid "Release the mouse button to select the objects in the rectangle."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
-msgid "Release the mouse button to stop rotating."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3152,5 +3152,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3728,7 +3728,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Engin mynd"
+msgstr ""
 
 #. teal
@@ -3909,5 +3908,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr ""
@@ -5182,5 +5181,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -5595,4 +5594,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5683,5 +5687,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Vensl"
@@ -5783,9 +5787,9 @@
 msgstr "Val: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Opna þessa stiku sem glugga"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5794,5 +5798,5 @@
 "vinstri tólastikunni."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Smelltu til að minnka/hámarka innihald stikunnar"
@@ -6122,4 +6126,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6132,10 +6142,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6805,145 +6809,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Heiti"
@@ -8163,10 +8167,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Gerð"
@@ -8174,5 +8178,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8186,17 +8189,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "óskilgreint"
@@ -8963,11 +8965,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8984,14 +8988,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Lag"
@@ -9528,5 +9532,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Lýsing"
@@ -10575,55 +10579,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11096,5 +11100,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Bíll"
@@ -11116,16 +11120,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Hjól"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11155,12 +11160,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Fótgangandi"
@@ -11861,12 +11866,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nafn götu"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Mælingar"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14113,6 +14116,7 @@
 msgstr "Upphala ferlum"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14203,5 +14207,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14388,5 +14392,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14427,19 +14431,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Byggingar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14447,5 +14451,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14458,10 +14462,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14644,5 +14648,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16460,5 +16464,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Almenningssamgöngur"
@@ -16510,5 +16514,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Vegpunktar"
@@ -17079,4 +17083,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Gerð"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17233,4 +17254,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Beygjutakmörkun"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Beygjutakmörkun"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17985,5 +18020,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Marghyrningur"
@@ -19253,7 +19288,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Tilvísun"
@@ -19270,5 +19305,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Akreinar"
@@ -19286,4 +19321,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19291,9 +19327,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Hámarkshraði (km/klst)"
@@ -19321,15 +19356,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19340,11 +19369,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Einstefnuvegur"
@@ -19364,15 +19392,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19389,11 +19415,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19414,8 +19440,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19433,11 +19459,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Göng"
@@ -19457,6 +19483,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19474,11 +19500,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Niðurgrafinn"
@@ -19498,6 +19524,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19515,11 +19541,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Upphækkun"
@@ -19657,5 +19683,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19664,12 +19690,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19677,13 +19706,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Breidd (í metrum)"
@@ -19712,24 +19741,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Slitlag"
@@ -19741,5 +19766,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19753,11 +19778,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "malbikaður"
@@ -19765,10 +19789,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "ómalbikaður"
@@ -19776,10 +19800,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19787,11 +19811,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19799,10 +19822,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19810,10 +19833,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "skógur"
@@ -19821,10 +19844,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19832,11 +19855,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "götusteinn"
@@ -19844,10 +19866,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19855,10 +19877,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19866,10 +19888,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19877,10 +19899,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19888,10 +19910,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -19899,10 +19921,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -19910,10 +19932,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -19994,6 +20016,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Vegur (óþekkt flokkun)"
@@ -20002,5 +20023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Breyti veg af óþekktri flokkun"
@@ -20008,6 +20029,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Í byggingu"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Breyti veg í byggingu"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Hringtorg"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "hringtorg"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Vegtakmarkanir"
@@ -20016,15 +20066,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Breyti vegtakmörkunum"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Tollur"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -20032,5 +20082,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Aðgangur"
@@ -20072,28 +20122,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "já"
@@ -20106,10 +20155,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20123,10 +20172,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20150,97 +20199,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "leyfður"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "í landbúnaðarskyni"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20255,10 +20304,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Hestar"
@@ -20274,10 +20323,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Vélhjól"
@@ -20292,19 +20341,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Bifreið"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Lámarkshraði (km/klst)"
@@ -20312,20 +20361,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Hámarksþyngt (í tonnum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Hámarkshæð (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Hámarksbreidd (í metrum)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Hámarkslengd (í metrum)"
@@ -20333,5 +20382,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Hringtorg"
@@ -20342,5 +20391,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Breyti hringtorgi"
@@ -20360,10 +20409,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "hraðbraut"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "tengibraut á hraðbraut"
@@ -20385,10 +20434,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stofnvegur"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20410,10 +20459,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20435,5 +20484,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20448,9 +20497,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "óflokkaður"
@@ -20464,9 +20513,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "íbúðargata"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "vistgata"
@@ -20496,10 +20545,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "þjónustuvegur"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20529,5 +20578,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20539,10 +20588,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Breyti brú"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Breyti göngum"
@@ -20550,39 +20599,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Vegir"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Í byggingu"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Breyti veg í byggingu"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Hringtorg"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "hringtorg"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20591,73 +20611,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr ""
@@ -20666,38 +20654,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20706,5 +20724,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20712,5 +20730,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Breyti reiðstíg"
@@ -20718,5 +20736,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20734,11 +20752,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Breyti hjólastíg"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20746,5 +20764,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20752,5 +20770,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20758,5 +20776,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20765,15 +20783,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Breyti göngustíg"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Stigi"
@@ -20783,10 +20797,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Breyti stiga"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr ""
@@ -20794,15 +20808,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Tilvísun"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Vegþjónustur"
@@ -20810,5 +20824,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Breyti vegþjónustu"
@@ -20848,17 +20862,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Rekstraraðili"
@@ -20867,5 +20881,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Umferðarljós"
@@ -20875,5 +20889,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20882,27 +20896,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "eyja"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20910,6 +20924,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20918,11 +20932,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20930,30 +20944,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr ""
@@ -20961,5 +20975,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Gangbraut"
@@ -20968,14 +20982,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -20983,33 +20997,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21017,5 +21031,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21023,5 +21037,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Smáhringtorg"
@@ -21032,14 +21046,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Átt"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "réttsælis"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Beygjuhringur"
@@ -21049,5 +21063,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Borgarmörk"
@@ -21055,15 +21069,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Breyti borgarmarkaskilti"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Hraðamyndavél"
@@ -21072,5 +21086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Neyðarsími"
@@ -21078,5 +21092,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21084,5 +21098,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21090,5 +21104,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21098,10 +21112,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Vað"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Breyti vaði"
@@ -21109,5 +21123,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Skarð"
@@ -21115,5 +21129,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Breyti skarði"
@@ -21125,7 +21139,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Hæð (y/s)"
@@ -21133,5 +21147,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Tálmar"
@@ -21139,5 +21153,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21145,5 +21159,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21188,16 +21202,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Leyfileg umferð:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21206,5 +21220,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21212,5 +21226,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Rimlahlið"
@@ -21218,10 +21232,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Breyti rimlahliði"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21229,15 +21243,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Tollskýli"
@@ -21245,5 +21259,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Breyti tollskýli"
@@ -21251,10 +21265,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Landamæraeftirlit"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Breyti landamæraeftirliti"
@@ -21264,5 +21278,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Limgerði"
@@ -21273,22 +21287,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21296,5 +21310,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Borgarveggur"
@@ -21303,5 +21317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21313,10 +21327,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Inngangur"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Breyti inngang"
@@ -21324,5 +21338,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Hlið"
@@ -21330,50 +21344,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Breyti hliði"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Liftuhlið"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Breyti liftuhliði"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21381,25 +21395,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21410,11 +21424,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vatn"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Goshver"
@@ -21422,5 +21436,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Breyti goshver"
@@ -21428,5 +21442,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Frárennsli"
@@ -21434,10 +21448,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Breyti frárennsli"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21445,10 +21459,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Lækur"
@@ -21456,10 +21470,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Breyti læk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Skipaskurður"
@@ -21467,10 +21481,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Breyti skipaskurð"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Á"
@@ -21480,5 +21494,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Breyti á"
@@ -21486,15 +21500,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Breyti vatni"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Breyti landi"
@@ -21502,15 +21516,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21518,15 +21532,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21534,5 +21548,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Árbakki"
@@ -21541,10 +21555,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Breyti árbakka"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Votlendi"
@@ -21555,14 +21569,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Breyti votlendi"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21576,35 +21590,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr ""
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Leðja"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Breyti leðju"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strönd"
@@ -21612,20 +21626,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Breyti strönd"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Flói"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Breyti flóa"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Klettur"
@@ -21633,10 +21647,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Breyti klett"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Strandlengja"
@@ -21644,5 +21658,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Breyti strandlengju"
@@ -21650,5 +21664,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Siglingarleið ferju"
@@ -21656,5 +21670,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21663,5 +21677,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21669,10 +21683,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Skipakví"
@@ -21680,5 +21694,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Breyti skipakví"
@@ -21686,5 +21700,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Stífla"
@@ -21692,15 +21706,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Breyti stíflu"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vatnspunktar"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr ""
@@ -21709,5 +21723,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21715,20 +21729,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Breyti fossi"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21737,15 +21751,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Smábátahöfn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Breyti smábátahöfn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Bryggja"
@@ -21753,10 +21767,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Breyti bryggju"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21764,10 +21778,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21777,20 +21791,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr ""
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Samgöngur"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -21798,5 +21812,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -21826,86 +21840,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21917,8 +21856,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21932,29 +21871,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21967,8 +21906,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22039,8 +21978,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22052,8 +21991,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Volt"
@@ -22066,8 +22005,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22080,23 +22019,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22104,50 +22043,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22155,5 +22094,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22162,10 +22101,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22174,9 +22113,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22185,5 +22124,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22192,5 +22131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22200,5 +22139,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22206,5 +22145,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22213,5 +22152,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22220,10 +22159,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Skíðalyfta"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Stólalyfta"
@@ -22231,10 +22170,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Breyti stólalyftu"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Toglyfta"
@@ -22242,10 +22181,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Breyti toglyftu"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Kláfur"
@@ -22253,10 +22192,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Breyti kláf"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22264,10 +22203,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22276,5 +22215,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22282,5 +22221,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22289,5 +22228,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22295,5 +22234,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Bensínstöð"
@@ -22303,62 +22242,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Breyti bensínstöð"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22416,32 +22355,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Opnunartími"
@@ -22500,165 +22439,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22675,5 +22614,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22683,5 +22622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Breyti stæði"
@@ -22692,25 +22631,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Tilvísun"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "slitlag"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22719,48 +22658,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr ""
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Bílaþvottastöð"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Breyti bílaþvottastöð"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr ""
@@ -22768,5 +22707,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Leiga"
@@ -22775,10 +22714,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Breyti bílaleigu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22786,5 +22725,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22792,10 +22731,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Breyti hjólastæði"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22804,10 +22743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Breyti hjólaleigu"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22817,5 +22756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22823,5 +22762,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Tilvísun"
@@ -22829,5 +22768,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22835,5 +22774,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22841,5 +22780,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22848,5 +22787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22854,5 +22793,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22861,5 +22800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22871,5 +22810,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22877,10 +22816,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr ""
@@ -22889,10 +22828,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -22901,5 +22840,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Strætóstöð"
@@ -22908,5 +22847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Breyti strætóstöð"
@@ -22914,5 +22853,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Strætóstopp"
@@ -22922,5 +22861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Breyti strætóstoppi"
@@ -22929,6 +22868,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Skýli"
@@ -22936,19 +22875,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bekkur"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -22956,5 +22895,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Leigubílastöð"
@@ -22962,5 +22901,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Breyti leigubílastöð"
@@ -22968,10 +22907,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Flugvöllur"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22979,5 +22918,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -22985,10 +22924,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -22997,5 +22936,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23003,5 +22942,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23009,5 +22948,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23015,5 +22954,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23021,5 +22960,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23027,5 +22966,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23035,5 +22974,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23043,5 +22982,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23052,6 +22991,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23061,5 +23000,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23068,5 +23007,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23074,5 +23013,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23080,15 +23019,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Ferðamennska"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Gisting"
@@ -23100,5 +23039,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hótel"
@@ -23107,15 +23046,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Breyti hóteli"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stjörnur"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Vegahótel"
@@ -23123,20 +23062,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Breyti vegahóteli"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Gistiheimili"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Breyti gistiheimili"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Fjallakofi (e. Chalet)"
@@ -23144,10 +23083,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Breyti fjallakofa í svissneskum stíl (e. Chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Farfuglaheimili"
@@ -23155,30 +23094,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Breyti farfuglaheimili"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr ""
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Breyti húsbílastæði"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Tjaldstæði"
@@ -23186,10 +23125,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Breyti tjaldstæði"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Matur & Drykkur"
@@ -23200,5 +23139,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Veitingastaður"
@@ -23206,5 +23145,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Breyti veitingastað"
@@ -23212,5 +23151,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Matargerð"
@@ -23218,73 +23157,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "ítölsk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "kínversk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamborgarar"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "grísk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "þýsk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indversk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "að hætti heimamanna"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "tyrknesk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asísk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "tælensk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexíkósk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japönsk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Skyndibiti"
@@ -23292,17 +23231,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Breyti skyndibitastað"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kaffihús"
@@ -23310,9 +23249,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Breyti kaffihúsi"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Bar"
@@ -23320,18 +23259,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Breyti bar"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Bjórgarður (þ. Biergarten)"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Breyti bjórgarði (þýska: Biergarten)"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23339,9 +23278,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Næturklúbbur"
@@ -23349,24 +23288,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Breyti næturklúbb"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Ferðamennska"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Safn"
@@ -23374,9 +23313,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Breyti safni"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Dýragarður"
@@ -23385,9 +23324,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Breyti dýragarð"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Útsýnisstaður"
@@ -23395,24 +23334,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Breyti útsýnisstað"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Skemmtigarður"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Breyti skemmtigarð"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Listaverk"
@@ -23420,5 +23359,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Breyti listaverki"
@@ -23426,19 +23365,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Upplýsingamiðstöð"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Kort"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23476,5 +23415,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23482,28 +23421,28 @@
 msgstr "stræti"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Nánari lýsing"
@@ -23513,5 +23452,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23519,5 +23458,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23525,6 +23464,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -23532,5 +23471,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23538,6 +23477,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skíði"
@@ -23545,5 +23484,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23551,46 +23490,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Fræðsluskilti"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "sagnfræði"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "náttúran"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "dýralíf"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23598,29 +23537,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Breyti skýli"
@@ -23628,25 +23567,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Eldstæði"
 
 #. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
 msgid "Historic Places"
 msgstr "Sögustaðir"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Kastali"
@@ -23655,19 +23594,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Breyti kastala"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Rústir"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Breyti rústum"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Fornleifasvæði"
@@ -23676,9 +23615,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Breyti fornleifasvæði"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Vígvöllur"
@@ -23686,10 +23625,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Breyti vígvelli"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23697,5 +23636,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23703,15 +23642,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Minnismerki"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Breyti minnismerki"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minnisvarði"
@@ -23719,55 +23658,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Breyti minnisvarða"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Frístundir"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vatnsleikjagarður"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Breyti vatnsleikjagarð"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Leikvöllur"
@@ -23775,35 +23714,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Breyti leikvöll"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskveiðar"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Breyti fiskveiðum"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Íþróttir"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Íþróttamannvirki"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Íþróttaleikvangur"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Breyti íþróttaleikvang"
@@ -23817,6 +23756,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "veldu íþrótt:"
@@ -24208,6 +24147,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24241,225 +24180,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bogfimi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "ástralskur fótbolti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "hafnabolti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "körfubolti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klifur"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokkí"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skotfimi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skautar"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skíði"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fótbolti"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "sund"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "borðtennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Íþróttamiðstöð"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Breyti íþróttamiðstöð"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Völlur"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Breyti velli"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfvöllur"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Breyti golfvelli"
 
+#: build/trans_presets.java:1938
+msgid "Miniature Golf"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Miniature Golf"
+#: build/trans_presets.java:1939
+msgid "Edit Miniature Golf"
+msgstr ""
+
 #: build/trans_presets.java:1945
-msgid "Miniature Golf"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
-msgid "Edit Miniature Golf"
-msgstr ""
-
-#: build/trans_presets.java:1952
 msgid "Sport"
 msgstr "Íþróttir"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24498,21 +24437,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "gerð"
@@ -24551,203 +24490,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "völlur"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "íþróttamiðstöð"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "íþróttaleikvangur"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bogfimi"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Breyti bogfimi"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klifur"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Breyti klifri"
 
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr ""
+
+#. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
-msgid "Dog Racing"
-msgstr ""
-
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
-msgid "Edit Dog Racing"
-msgstr ""
-
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
-msgid "Equestrian"
-msgstr ""
-
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
-msgid "Edit Equestrian"
-msgstr ""
-
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
-msgid "Edit Gymnastics"
-msgstr ""
-
-#: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skautar"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Breyti skautum"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr ""
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Sund"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Breyti sundi"
@@ -24755,52 +24694,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Breyti skíðasvæði"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skotfimi"
@@ -24808,177 +24747,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Breyti skotfimi"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Boltaíþróttir"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fótbolti"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Breyti fótbolta"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerískur fótbolti"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Breyti Amerískum fótbolta"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Ástralskur fótbolti"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Breyti Áströlskum fótbolta"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Hafnabolti"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Breyti hafnabolta"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Körfubolti"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Breyti körfubolta"
 
+#: build/trans_presets.java:2084
+msgid "Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf"
+#: build/trans_presets.java:2085
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2088
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
 #: build/trans_presets.java:2091
-msgid "Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
-msgid "golf_course"
-msgstr ""
-
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokkí"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Breyti hokkí"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
-msgid "Edit Racquet"
-msgstr ""
-
-#: build/trans_presets.java:2145
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Borðtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Breyti borðtennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Breyti tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Mannvirki"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygging"
@@ -24986,5 +24925,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Opinber bygging"
@@ -24992,10 +24931,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Breyti opinberri byggingu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Ráðhús"
@@ -25003,10 +24942,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Breyti ráðhúsi"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Sendiráð"
@@ -25014,10 +24953,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Breyti sendiráði"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Dómshús"
@@ -25026,10 +24965,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Breyti dómshúsi"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fangelsi"
@@ -25038,10 +24977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Breyti fangelsi"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Lögreglustöð"
@@ -25051,10 +24990,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Breyti lögreglustöð"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Slökkvistöð"
@@ -25063,10 +25002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Breyti slökkvistöð"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pósthús"
@@ -25074,5 +25013,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Breyti pósthúsi"
@@ -25080,15 +25019,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Leikskóli"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Breyti leikskóla"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skóli"
@@ -25096,10 +25035,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Breyti skóla"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Háskóli"
@@ -25107,10 +25046,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Breyti háskóla"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Menntaskóli"
@@ -25118,5 +25057,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Breyti menntaskóla"
@@ -25124,5 +25063,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kvikmyndahús"
@@ -25131,10 +25070,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Breyti kvikmyndahúsi"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bókasafn"
@@ -25143,9 +25082,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Breyti bókasafni"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Listamiðstöð"
@@ -25153,10 +25092,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Breyti listamiðstöð"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Leikhús"
@@ -25165,10 +25104,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Breyti leikhúsi"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Helgistaður"
@@ -25178,5 +25117,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Breyti helgistað"
@@ -25185,6 +25124,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr ""
@@ -25193,66 +25132,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25261,81 +25200,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Heimilisfang"
@@ -25344,5 +25283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Breyti heimilisfangi"
@@ -25350,5 +25289,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Húsnúmer"
@@ -25356,25 +25295,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nafn húss"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nafn götu"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nafn bæjar"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Póstnúmer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskóði"
@@ -25383,5 +25322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25389,61 +25328,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Mannvirki"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Turn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Breyti turni"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25451,25 +25390,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vatnsturn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Breyti vatnsturni"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Viti"
@@ -25477,10 +25416,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Breyti vita"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vindmylla"
@@ -25488,10 +25427,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Breyti vindmyllu"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Leiðsla"
@@ -25500,41 +25439,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Breyti leiðslu"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -25544,10 +25483,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Krani"
@@ -25555,5 +25494,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Breyti krana"
@@ -25561,10 +25500,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25572,10 +25511,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Eftirlitsmyndavél"
@@ -25583,23 +25522,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Breyti eftirlitsmyndavél"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Rafall"
@@ -25609,35 +25548,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Breyti rafli"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Orkuver"
@@ -25646,10 +25585,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Breyti orkuveri"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Spennustöð"
@@ -25658,5 +25597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Breyti spennustöð"
@@ -25664,10 +25603,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Tilvísunarnúmer línunnar"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Háspennustaur"
@@ -25678,23 +25617,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Breyti háspennustaur"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Raflína"
@@ -25703,74 +25642,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Breyti raflínu"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Salerni"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Athugasemd"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Póstkassi"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Almenningssími"
@@ -25779,5 +25718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Breyti almenningssíma"
@@ -25785,5 +25724,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mynt"
@@ -25791,5 +25730,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Athugasemd"
@@ -25797,5 +25736,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25803,5 +25742,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debetkort"
@@ -25809,15 +25748,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Símakort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Endurvinnsla"
@@ -25826,5 +25765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Breyti endurvinnslustöð"
@@ -25832,35 +25771,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Rafhlöður"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Dósir"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Föt"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Gler"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Pappír"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Brotajárn"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25868,5 +25807,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25875,31 +25814,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -25978,5 +25917,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -25986,31 +25925,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26019,30 +25958,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Hæð"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Gosbrunnur"
@@ -26051,10 +25990,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Breyti gosbrunn"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Drykkjarvatn"
@@ -26063,10 +26002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Breyti drykkjarvatni"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26075,5 +26014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26081,5 +26020,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Barnalúga"
@@ -26087,15 +26026,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Breyti barnalúgu"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Verslanir"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26103,10 +26042,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Breyti bílabúð"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26115,28 +26054,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Breyti hjólabúð"
 
 #. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr ""
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
 #: build/trans_presets.java:2545
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2551
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2552
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26144,9 +26083,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Sjoppa"
@@ -26154,27 +26093,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Breyti sjoppu"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr ""
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr ""
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Ferðaskrifstofa"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Breyti ferðaskrifstofu"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Slátrari"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Breyti slátrara"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Bakarí"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Breyti bakaríi"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Blómabúð"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Breyti blómabúð"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Lífræn búð"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Breyti lífrænni búð"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Vínbúð"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Tölvubúð"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Breyti tölvubúð"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Raftækjabúð"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Breyti raftækjabúð"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hljómtækjaverslun"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Breyti hljómtækjaverslun"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Húsgagnaverslun"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Breyti húsgagnaverslun"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Skrifstofuvörur"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Breyti skrifstofuvörum"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Hársnyrtir"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Breyti hársnyrti"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Skóbúð"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Breyti skóbúð"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Dótabúð"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Breyti dótabúð"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Efnalaug"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Breyti efnalaug"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Þvottahús"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Breyti þvottahúsi"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Útivistarbúð"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Breyti útivistarbúð"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Breyti sjóntækjasmið"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Sjálfsali"
@@ -26182,5 +26335,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr ""
@@ -26188,306 +26341,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "dagblöð"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "dót"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "hjól"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Slátrari"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Breyti slátrara"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Bakarí"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Breyti bakaríi"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Blómabúð"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Breyti blómabúð"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Lífræn búð"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Breyti lífrænni búð"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Vínbúð"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Tölvubúð"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Breyti tölvubúð"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Raftækjabúð"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Breyti raftækjabúð"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hljómtækjaverslun"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Breyti hljómtækjaverslun"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Húsgagnaverslun"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Breyti húsgagnaverslun"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Skrifstofuvörur"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Breyti skrifstofuvörum"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Hársnyrtir"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Breyti hársnyrti"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Skóbúð"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Breyti skóbúð"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Dótabúð"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Breyti dótabúð"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Efnalaug"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Breyti efnalaug"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Þvottahús"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Breyti þvottahúsi"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Útivistarbúð"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Breyti útivistarbúð"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Breyti sjóntækjasmið"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Fjármál"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banki"
@@ -26495,14 +26440,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Breyti banka"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Hraðbanki"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Gjaldeyrisskipti"
@@ -26510,5 +26455,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Breyti gjaldeyrisskiptum"
@@ -26516,15 +26461,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Breyti hraðbanka"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Heilsa"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Læknir"
@@ -26532,18 +26477,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Breyti lækni"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Tannlæknir"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Breyti tannlækni"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apótek"
@@ -26551,5 +26496,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Apótek"
@@ -26557,9 +26502,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Spítali"
@@ -26567,10 +26512,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Breyti spítala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26579,5 +26524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26586,20 +26531,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26607,5 +26552,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Dýralæknir"
@@ -26614,64 +26559,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Breyti dýralækni"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Landafræði"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Staðir"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Heimsálfa"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Breyti heimsálfu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Breyti landi"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Fylki"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Breyti fylki"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Svæði"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Breyti svæði"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Sýsla"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Breyti sýslu"
@@ -26679,15 +26624,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Borg"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Breyti borg"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Bær"
@@ -26695,10 +26640,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Breyti bæ"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Hverfi"
@@ -26706,25 +26651,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Breyti hverfi"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Þorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Breyti þorpi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Smáþorp"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Breyti smáþorpi"
@@ -26732,5 +26677,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26738,10 +26683,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Eyja"
@@ -26749,10 +26694,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Breyti eyju"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26760,5 +26705,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26766,5 +26711,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Hellismunni"
@@ -26772,10 +26717,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Breyti hellismunna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Tindur"
@@ -26783,10 +26728,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Breyti tind"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Jökull"
@@ -26794,10 +26739,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Breyti jökli"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Eldfjall"
@@ -26805,70 +26750,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Breyti eldfjalli"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Landamæri"
 
 #. group "Boundaries"
+#: build/trans_presets.java:2933
+msgid "National"
+msgstr ""
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2934
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Boundaries/National" text "Name"
+#: build/trans_presets.java:2939
+msgid "Administrative"
+msgstr ""
+
+#. item "Boundaries/Administrative"
 #: build/trans_presets.java:2940
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:2941
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
 #: build/trans_presets.java:2946
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2957
+msgid "National park"
+msgstr ""
+
+#. item "Boundaries/National park"
 #: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:2965
 msgid "Edit National Park Boundary"
 msgstr "Breyti landamærum þjóðgarðs"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Landnýting"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Tré"
@@ -26877,15 +26822,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Breyti tré"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Fræðiheiti"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Skógur"
@@ -26894,5 +26839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Breyti skóg"
@@ -26900,17 +26845,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "barrskógur"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "laufskógur"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "blandaður"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Skógur (ræktaður)"
@@ -26919,14 +26864,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Breyti ræktuðum skóg"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr ""
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -26934,25 +26879,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -26960,10 +26905,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -26971,5 +26916,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -26977,5 +26922,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -26984,45 +26929,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr ""
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr ""
+
+#. item "Land use/Meadow"
 #: build/trans_presets.java:3036
-msgid "Farmland"
-msgstr ""
-
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3037
-msgid "Edit Farmland Landuse"
-msgstr ""
-
-#. item "Land use/Farmland" text "Name"
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3041
+msgid "Vineyard"
+msgstr ""
+
+#. item "Land use/Vineyard"
 #: build/trans_presets.java:3042
-msgid "Meadow"
-msgstr ""
-
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3043
-msgid "Edit Meadow Landuse"
-msgstr ""
-
-#. item "Land use/Meadow" text "Name"
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3047
+msgid "Allotments"
+msgstr ""
+
+#. item "Land use/Allotments"
 #: build/trans_presets.java:3048
-msgid "Vineyard"
-msgstr ""
-
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
-msgid "Edit Vineyard Landuse"
-msgstr ""
-
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
-msgid "Allotments"
-msgstr ""
-
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3055
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27030,25 +26975,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Garður"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Breyti garði"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27056,10 +27001,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27067,20 +27012,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Almenningsgarður"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Breyti almenningsgarð"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27088,5 +27033,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27094,15 +27039,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Íbúðarsvæði"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Breyti íbúðarlandnýtingu"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Grafreitur"
@@ -27110,9 +27055,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Breyti grafreit"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr ""
@@ -27120,39 +27065,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Breyti kirkjugarðslandnýtingu"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Smásala"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Breyti smásölulandnýtingu"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Skrifstofur"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Breyti skrifstofulandnýtingu"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Iðnaður"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Breyti iðnaðarlandnýtingu"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27160,15 +27105,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27176,50 +27121,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Byggingarsvæði"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Breyti byggingarsvæðislandnýtingu"
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3170
+msgid "Quarry"
+msgstr ""
+
+#. item "Land use/Quarry"
 #: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
-msgid "Edit Landfill Landuse"
-msgstr ""
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
-msgid "Quarry"
-msgstr ""
-
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3178
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27229,5 +27174,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Breyta marghyrningi"
@@ -27236,10 +27181,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27247,5 +27192,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Beygjutakmörkun"
@@ -27254,5 +27199,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Breyti beygjutakmörkun"
@@ -27260,34 +27205,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "vinstri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "hægri beygjur óleyfilegar"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "óleyfilegt að halda beint áfrám"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "óleyfilegt að taka U-beygju"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "aðeins_beint_fram"
@@ -27296,15 +27241,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "af vegi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "gegnum hnút eða veg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "að vegi"
@@ -27312,5 +27257,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27319,5 +27264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27325,5 +27270,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27414,5 +27359,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27422,17 +27367,17 @@
 msgstr "hjól"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27492,5 +27437,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27499,9 +27444,9 @@
 msgstr "fótgangandi"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27515,10 +27460,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27526,31 +27471,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27559,31 +27504,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/it.po
===================================================================
--- /applications/editors/josm/i18n/po/it.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/it.po	(revision 20945)
@@ -5,6 +5,6 @@
 "Project-Id-Version: josm 20081003\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-12 15:53+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-16 10:59+0000\n"
 "Last-Translator: Davide Prade <davalv@alice.it>\n"
 "Language-Team: Italian <talk-it@lists.openstreetmap.org>\n"
@@ -13,5 +13,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -63,5 +63,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1220,5 +1220,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Impossibile spostare degli oggetti fuori dal mondo."
@@ -1554,5 +1554,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2342,9 +2342,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2428,18 +2428,18 @@
 msgstr "Termina tracciamento."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Estrudi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Crea aree"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Estrudi il percorso"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
@@ -2447,5 +2447,5 @@
 "mouse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -2453,5 +2453,5 @@
 "del mouse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2475,6 +2475,6 @@
 "di quel punto."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2486,9 +2486,9 @@
 msgstr "Seleziona"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Seleziona, muovi e ruota gli oggetti."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2497,17 +2497,17 @@
 msgstr[1] "Aggiungi e sposta un nuovo nodo virtuale sui {0} percorsi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Muovi elementi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Muoverli"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Annullare lo spostamento"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2520,5 +2520,5 @@
 "Si vuole veramente spostarli?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr ""
@@ -2526,5 +2526,5 @@
 "rettangolo."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2533,9 +2533,9 @@
 "più vicino."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Rilascia il bottone del mouse per interrompere la rotazione."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3317,5 +3317,5 @@
 msgstr "Applicare?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3732,19 +3732,20 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:265
 msgid "<h2>Filter active</h2>"
-msgstr ""
+msgstr "<h2>Filtro attivo</h2>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:271
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
+msgstr "<p><b>{0}</b> oggetti nascosti"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:279
 #, java-format
 msgid "<b>{0}</b> objects disabled"
-msgstr ""
+msgstr "<b>{0}</b> oggetti disabilitati"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:282
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
+"</p><p>Chiudi la finestra di filtro per vedere tutti gli oggetti.<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:463
@@ -3937,17 +3938,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr "Nodo: standard"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "collegamento"
+msgstr "Nodo: connessione"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "etichettato"
+msgstr "Nodo: etichettato"
 
 #. teal
@@ -4132,5 +4130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "ferrovia"
@@ -5511,5 +5509,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "tutti"
@@ -5968,4 +5966,9 @@
 msgstr "Modalità filtro"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -6056,5 +6059,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relazioni"
@@ -6158,9 +6161,9 @@
 msgstr "Selezione: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Stacca il pannello"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6169,5 +6172,5 @@
 "degli strumenti a sinistra."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Cliccare per minimizzare/massimizzare il contenuto del pannello"
@@ -6517,4 +6520,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6527,10 +6536,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7200,145 +7203,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nome"
@@ -8685,10 +8688,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Tipo"
@@ -8696,5 +8699,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8708,17 +8710,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "sconosciuto"
@@ -9601,11 +9602,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9622,14 +9625,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Layer"
@@ -10233,5 +10236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Descrizione"
@@ -11398,21 +11401,21 @@
 msgstr "Chiudi la finestra ed accetta il token di accesso"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Attenzione: fallito l'annullamento dell'operazione OAuth in esecuzione"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Ottenimento del token di richiesta OAuth da ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Ottenimento del token di accesso OAuth da ''''{0}''''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
@@ -11421,5 +11424,5 @@
 "''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11428,10 +11431,10 @@
 "''''***'''' come utente OAuth"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Impossibile autorizzare la richiesta OAuth ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
@@ -11440,19 +11443,19 @@
 "corso..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Inizializzazione della sessione sul sito web OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Autenticazione della sessione per l''utente ''''{0}''''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Autorizzazione del token di richiesta ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -12001,5 +12004,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Automobile"
@@ -12021,16 +12024,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicicletta"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -12060,12 +12064,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Pedone"
@@ -12826,17 +12830,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Parametri OAuth avanzati"
+msgstr "Parametri dell''azione"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nome Strada"
+msgstr "Nome parametro"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Valori misurati"
+msgstr "Valore parametro"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -15446,6 +15447,7 @@
 msgstr "Carica tracciati"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibilità"
@@ -15537,5 +15539,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolazione indirizzo"
@@ -15728,5 +15730,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Crea edificio"
@@ -15767,19 +15769,19 @@
 msgstr "Imposta la larghezza dell'edificio"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Estrai edificio al click (solamente immagini vettoriali)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Edifici"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15789,5 +15791,5 @@
 "fabbricati e un livello dati OSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15803,10 +15805,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Seleziona Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15850,7 +15852,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "File cache della zona 4 di Lambert (.4)"
+msgstr "File di cache di Riunione RGR92 (.UTM4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -16004,5 +16005,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17917,5 +17918,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Trasporto pubblico"
@@ -17967,5 +17968,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Punti del percorso"
@@ -18560,4 +18561,23 @@
 "Nella tabella seguente si possono modificare i <strong>membri grezzi</"
 "strong> della relazione OSM che rappresenta questo divieto di svolta."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Tipo"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Da:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+#, fuzzy
+msgid "To:"
+msgstr "A:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
@@ -18739,4 +18759,18 @@
 msgstr "Già coinvolto in un conflitto"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Elimina dal divieto di svolta"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Elimina dal divieto di svolta"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -19568,5 +19602,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multi-poligono"
@@ -20985,7 +21019,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Riferimento"
@@ -21002,5 +21036,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Corsie"
@@ -21018,4 +21052,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -21023,9 +21058,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Velocità massima (km/h)"
@@ -21053,15 +21087,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -21072,11 +21100,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Senso unico"
@@ -21096,15 +21123,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -21121,11 +21146,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -21146,8 +21171,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -21165,11 +21190,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Galleria/tunnel"
@@ -21189,6 +21214,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -21206,11 +21231,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Sbancamento"
@@ -21230,6 +21255,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -21247,11 +21272,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Terrapieno"
@@ -21389,5 +21414,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Slarghi per l''incrocio"
@@ -21396,12 +21421,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -21409,13 +21437,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Larghezza (metri)"
@@ -21444,24 +21472,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Superficie"
@@ -21473,5 +21497,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -21485,11 +21509,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "pavimentata"
@@ -21497,10 +21520,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "non pavimentata"
@@ -21508,10 +21531,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asfalto"
@@ -21519,11 +21542,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "calcestruzzo"
@@ -21531,10 +21553,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "metallo"
@@ -21542,10 +21564,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "bosco"
@@ -21553,10 +21575,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "lastricato"
@@ -21564,11 +21586,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "ciottoli (pavé)"
@@ -21576,10 +21597,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "ghiaia"
@@ -21587,10 +21608,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "ciottoli"
@@ -21598,10 +21619,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "compattato"
@@ -21609,10 +21630,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "erba"
@@ -21620,10 +21641,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "erba"
@@ -21631,10 +21652,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sabbia"
@@ -21642,10 +21663,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "terra"
@@ -21726,6 +21747,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Road (Tipo Sconosciuto)"
@@ -21734,5 +21754,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Modifica Road (Tipo Sconosciuto)"
@@ -21740,6 +21760,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Construction"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Modifica una strada in costruzione"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Svincolo"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rotatoria"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Restrizioni e divieti"
@@ -21748,15 +21797,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Modifica restrizioni e divieti"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Pedaggio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Senza uscita (cul-de-sac)"
@@ -21764,5 +21813,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Permesso di accesso"
@@ -21804,28 +21853,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "si"
@@ -21838,10 +21886,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21855,10 +21903,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21882,97 +21930,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permesso"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "Agricolo"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "forestale"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "carico e scarico"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "no"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Agricolo"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "specifico"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "ufficiale"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Carico e scarico merci"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Merci pesanti/Trasporti eccezionali"
@@ -21987,10 +22035,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Cavallo"
@@ -22006,10 +22054,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocicletta"
@@ -22024,19 +22072,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Automobile"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Veicoli di servizio pubblico"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Velocità minima (km/h)"
@@ -22044,20 +22092,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Peso massimo (tonnellate)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Altezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Larghezza massima (metri)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Lunghezza massima (metri)"
@@ -22065,5 +22113,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rotatoria"
@@ -22074,5 +22122,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Modifica un incrocio"
@@ -22092,10 +22140,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada/tangenziale"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "collegamento autostradale"
@@ -22117,10 +22165,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -22142,10 +22190,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primaria"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "svincolo primario"
@@ -22167,5 +22215,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -22180,9 +22228,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "terziaria"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "unclassified"
@@ -22196,9 +22244,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "residenziale"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "living_street"
@@ -22228,10 +22276,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "strada di servizio"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "autobus guidato"
@@ -22261,5 +22309,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -22271,10 +22319,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Modifica ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Modifica un Tunnel"
@@ -22282,39 +22330,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Percorsi"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Construction"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Modifica una strada in costruzione"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Svincolo"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rotatoria"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Track"
@@ -22323,73 +22342,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Modifica Track"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Tipo di traccia"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "grado1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "grado2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "grado3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "grado4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "grado5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "Scala di classificazione MTB"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "Scala escursionistica SAC"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "escursionismo"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "escursionismo alpino"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "escursionisti esperti"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "sentiero alpino"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "sentiero alpino impegnativo"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "sentiero alpino difficile"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Percorso"
@@ -22398,38 +22385,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Modifica percorso"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "Scala escursionistica SAC"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "escursionismo"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "escursionismo alpino"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "escursionisti esperti"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "sentiero alpino"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "sentiero alpino impegnativo"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "sentiero alpino difficile"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "eccellente"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "buona"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "intermedio"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "cattiva"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "orribile"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Sedie a rotelle"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Sci"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Motoslitta"
@@ -22438,5 +22455,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Percorso dedicato all''equitazione"
@@ -22444,5 +22461,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Modifica un percorso per equitazione"
@@ -22450,5 +22467,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Pista ciclabile dedicata"
@@ -22466,11 +22483,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Modifica Cycleway"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Pedoni"
@@ -22478,5 +22495,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Pista pedonale separata- e ciclabile"
@@ -22484,5 +22501,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Pista combinata pedonale- e ciclabile"
@@ -22490,5 +22507,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Marciapiede Dedicato"
@@ -22497,15 +22514,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Modifica Footway"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Biciclette"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Rampa di scale"
@@ -22515,10 +22528,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Modifica una rampa di scale"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Svincolo autostradale"
@@ -22526,15 +22539,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Modifica svincolo autostradale"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Numero"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Stazione di servizio"
@@ -22542,5 +22555,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Modifica stazione di servizio"
@@ -22580,17 +22593,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operatore"
@@ -22599,5 +22612,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Semaforo"
@@ -22607,5 +22620,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Tipo di attraversamento pedonale"
@@ -22614,27 +22627,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "non presidiato"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "Semaforo"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "isola spartitraffico"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "non marcato"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Attraversamento a cavallo"
@@ -22642,6 +22655,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Attraversamento ciclabile"
@@ -22650,11 +22663,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Attraversamento controllato"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Nome del tipo di attraversamento (UK)"
@@ -22662,30 +22675,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "strisce pedonali"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "attraversamento pedonale regolato da semaforo"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -22693,5 +22706,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Attraversamento pedonale"
@@ -22700,14 +22713,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Modifica attraversamento pedonale"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Nome del tipo (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Rallentatore del traffico"
@@ -22715,33 +22728,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Modifica rallentatore del traffico"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "dosso"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "chicane"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "restringimento"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "cuscino berlinese"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "dosso lungo"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "dosso piatto"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Slargo per l''incrocio"
@@ -22749,5 +22762,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Modifica slargo per l''incrocio"
@@ -22755,5 +22768,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "mini-rotatoria"
@@ -22764,14 +22777,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Direzione"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "senso orario"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Slargo per inversione di marcia"
@@ -22781,5 +22794,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "City Limit"
@@ -22787,15 +22800,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Modifica City Limit"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Secondo nome"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Speed Camera"
@@ -22804,5 +22817,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Telefono di emergenza"
@@ -22810,5 +22823,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Rampa"
@@ -22816,5 +22829,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Rampa ripida"
@@ -22822,5 +22835,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Cassone di sabbia"
@@ -22830,10 +22843,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Guado"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Modifica guado"
@@ -22841,5 +22854,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Passo montano"
@@ -22847,5 +22860,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Modifica passo montano"
@@ -22857,7 +22870,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Elevazione"
@@ -22865,5 +22878,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barriere"
@@ -22871,5 +22884,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Colonnina"
@@ -22877,5 +22890,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Modifica colonnina"
@@ -22920,16 +22933,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Traffico permesso:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Barriera per biciclette"
@@ -22938,5 +22951,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Blocco"
@@ -22944,5 +22957,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Griglia"
@@ -22950,10 +22963,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Modifica griglia"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Trappola bus"
@@ -22961,15 +22974,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spunzoni"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Modifica spunzoni"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Casello (per pedaggio)"
@@ -22977,5 +22990,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Modifica casello (per pedaggio)"
@@ -22983,10 +22996,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Dogana"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Modifica dogana"
@@ -22996,5 +23009,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Siepe"
@@ -23005,22 +23018,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Recinto"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "recinzione"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "recinto in legno"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "recinto in rete"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Muro"
@@ -23028,5 +23041,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Cinta muraria"
@@ -23035,5 +23048,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Muro di contenimento"
@@ -23045,10 +23058,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Punto di accesso"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Modifica punto di accesso"
@@ -23056,5 +23069,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Cancello"
@@ -23062,50 +23075,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Modifica cancello"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Cancello a sollevamento"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Modifica cancello a sollevamento"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Modifica cancello di filo spinato"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Bump Gate"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Modifica un Bump Gate"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Kissing Gate"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Modifica un Kissing Gate"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Scaletta"
@@ -23113,25 +23126,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Modifica scaletta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Tornello"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Modifica tornello"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Porta di cinta muraria"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Modifica porta di cinta muraria"
@@ -23142,11 +23155,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Acqua"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Sorgente"
@@ -23154,5 +23167,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Modifica sorgente"
@@ -23160,5 +23173,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Canale di scolo"
@@ -23166,10 +23179,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Modifica un canale di scolo"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Fosso"
@@ -23177,10 +23190,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Modifica fosso"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Torrente"
@@ -23188,10 +23201,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Modifica un torrente"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Canale"
@@ -23199,10 +23212,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Modifica un canale"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Fiume"
@@ -23212,5 +23225,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Modifica un fiume"
@@ -23218,15 +23231,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Modifica acqua"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Terraferma"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Modifica terraferma"
@@ -23234,15 +23247,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Bacino"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Modifica area di bacino"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Serbatoio"
@@ -23250,15 +23263,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Modifica area di riserva d''acqua"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Bacino coperto"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Modifica bacino coperto"
@@ -23266,5 +23279,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Argine"
@@ -23273,10 +23286,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Modifica un argine"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Zona umida"
@@ -23287,14 +23300,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Modifica zona umida"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "palude"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "torbiera"
@@ -23308,35 +23321,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "palude alluvionale"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "canneto"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "palude salata"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "barena"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrovie"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Modifica zona fangosa (sabbie mobili)"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Spiaggia"
@@ -23344,20 +23357,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Modifica spiaggia"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Baia"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Modifica baia"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Rupe"
@@ -23365,10 +23378,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Modifica Rupe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Linea di costa"
@@ -23376,5 +23389,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Modifica linea di costa"
@@ -23382,5 +23395,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Itinerario traghetto"
@@ -23388,5 +23401,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Modifica una linea traghetto"
@@ -23395,5 +23408,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Cantiere navale"
@@ -23401,10 +23414,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Modifica cantiere navale"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Darsena/bacino navale"
@@ -23412,5 +23425,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Modifica una darsena/bacino navale"
@@ -23418,5 +23431,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Diga"
@@ -23424,15 +23437,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Modifica una diga"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Punto di corso d''acqua"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Chiusa (non blocca la navigazione)"
@@ -23441,5 +23454,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Sbarramento"
@@ -23447,20 +23460,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Modifica sbarramento"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Cascata"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Modifica una cascata"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Punto di inversione di marcia"
@@ -23469,15 +23482,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Porto turistico"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Modifica un porto turistico"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Passerella"
@@ -23485,10 +23498,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Modifica passerella"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Terminal traghetti"
@@ -23496,10 +23509,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Modifica terminal traghetti"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Rampa per la messa in acqua di imbarcazioni"
@@ -23509,20 +23522,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Modifica una rampa per la messa in acqua di imbarcazioni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Trasporto"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Ferrovia"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Ferrovia"
@@ -23530,5 +23543,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Modifica una ferrovia"
@@ -23558,86 +23571,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Scartamento (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -23649,8 +23587,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Tipi"
@@ -23664,29 +23602,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "tratto per lo smistamento delle merci"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "tratto parallelo ad una ferrovia principale"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "tratto per una società o ente"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Elettrificato"
@@ -23699,8 +23637,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "linea aerea"
@@ -23771,8 +23709,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23784,8 +23722,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Tensione"
@@ -23798,8 +23736,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Frequenza (Hz)"
@@ -23812,23 +23750,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Ferrovia a scartamento ridotto"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Modifica una ferrovia a scartamento ridotto"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorotaia"
@@ -23836,50 +23774,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Modifica una monorotaia"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Ferrovia storica"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Modifica una ferrovia storica"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Metropolitana di superficie"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Modifica una metropolitana di superficie"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metropolitana"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Modifica una metropolitana"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tramvia"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Modifica una tramvia"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Autobus guidato"
@@ -23887,5 +23825,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Modificare autobus guidato"
@@ -23894,10 +23832,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Ferrovia in disuso"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Modifica una ferrovia in disuso"
@@ -23906,9 +23844,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Tipi opzionali"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Ferrovia abbandonata"
@@ -23917,5 +23855,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Passaggio a livello"
@@ -23924,5 +23862,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Attraversamento"
@@ -23932,5 +23870,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Tipo di attraversamento"
@@ -23938,5 +23876,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Piattaforma ferroviaria girevole"
@@ -23945,5 +23883,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Respingente"
@@ -23952,10 +23890,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Impianto di risalita"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Seggiovia"
@@ -23963,10 +23901,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Modifica una seggiovia"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Ski-lift"
@@ -23974,10 +23912,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Modifica uno ski-lift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Cabinovia"
@@ -23985,10 +23923,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Modifica una cabinovia"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Cabinovia"
@@ -23996,10 +23934,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Modifica cabinovia"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -24008,5 +23946,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -24014,5 +23952,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -24021,5 +23959,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -24027,5 +23965,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Stazione di rifornimento"
@@ -24035,62 +23973,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Modifica una stazione di rifornimento"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Indipend."
@@ -24148,32 +24086,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Orario di apertura"
@@ -24232,165 +24170,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Lu-Ve 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ma-Do 08:00-15:00; Sa 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Tipi di carburante:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Bio Diesel"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "Diesel (Gas To Liquid - ultimate diesel)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "Diesel per veicoli di trasporto merci pesanti"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "91 ottani"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "95 ottani"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "98 ottani"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "100 ottani"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (miscela 10% etanolo)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (miscela 85% etanolo)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "GPL (gas di petrolio liquefatto)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "GNC (gas naturale compresso)"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "Miscela 1/25 (mofa/moped)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "Miscela 1/50 (mofa/moped)"
@@ -24407,5 +24345,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -24415,5 +24353,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Modifica parcheggio"
@@ -24424,25 +24362,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Numero di riferimento"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "multi-piano"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "superficie"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "sotterraneo"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Parcheggio di interscambio"
@@ -24451,48 +24389,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Tariffa"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Capacità (totale)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Spazi per disabili"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Spazi per le donne"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Spazi per gli elementi da cui dipende"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Vedere il Wiki per un''altra capacità:[tipi]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Autolavaggio"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Modifica autolavaggio"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Autofficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Modifica autofficina"
@@ -24500,5 +24438,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Noleggio"
@@ -24507,10 +24445,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Modifica noleggio automobili"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Condivisione"
@@ -24518,5 +24456,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Modifica condivisione automobili"
@@ -24524,10 +24462,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Modifica parcheggio per biciclette"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacità"
@@ -24536,10 +24474,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Modifica noleggio biciclette"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -24549,5 +24487,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -24555,5 +24493,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "Riferimento UIC"
@@ -24561,5 +24499,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Stazione ferroviaria non presidiata"
@@ -24567,5 +24505,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Modifica stazione non presidiata"
@@ -24573,5 +24511,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Fermata del tram"
@@ -24580,5 +24518,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Modifica fermata del tram"
@@ -24586,5 +24524,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Piattaforma ferroviaria"
@@ -24593,5 +24531,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Modifica una piattaforma ferroviaria"
@@ -24603,5 +24541,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Riferimento (numero del tracciato)"
@@ -24609,10 +24547,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Area"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Ingresso metropolitana"
@@ -24621,10 +24559,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Modifica ingresso metropolitana"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Sedia a rotelle"
@@ -24633,5 +24571,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Stazione degli autobus"
@@ -24640,5 +24578,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Modifica una stazione degli autobus"
@@ -24646,5 +24584,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Fermata dell''autobus"
@@ -24654,5 +24592,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Modifica fermata dell''autobus"
@@ -24661,6 +24599,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Pensilina/ricovero"
@@ -24668,19 +24606,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Panchina"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Pavimentazione tattile"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Piattaforma fermata bus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Modifica una piattaforma degli autobus"
@@ -24688,5 +24626,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -24694,5 +24632,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Stazione dei taxi"
@@ -24700,10 +24638,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Terreno aeroportuale"
@@ -24711,5 +24649,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Modifica terreno aeroportuale"
@@ -24717,10 +24655,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -24729,5 +24667,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Pista di decollo/atterraggio"
@@ -24735,5 +24673,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Modifica pista di decollo/atterraggio"
@@ -24741,5 +24679,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Pista di rullaggio"
@@ -24747,5 +24685,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Modifica pista di rullaggio"
@@ -24753,5 +24691,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Eliporto"
@@ -24759,5 +24697,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Modifica eliporto"
@@ -24767,5 +24705,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Parcheggio aeromobili"
@@ -24775,5 +24713,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -24784,6 +24722,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Torre radio"
@@ -24793,5 +24731,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Manica a vento"
@@ -24800,5 +24738,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Terminal aeroportuale"
@@ -24806,5 +24744,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Modifica terminal aeroportuale"
@@ -24812,15 +24750,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Modifica varco terminal aeroportuale"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Viaggio"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Alloggiamento"
@@ -24832,5 +24770,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24839,15 +24777,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Modifica hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stelle"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24855,20 +24793,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Modifica Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Guest House"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Modifica Guest House"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Casetta (chalet)"
@@ -24876,10 +24814,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Modifica casetta (chalet)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Ostello"
@@ -24887,30 +24825,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Modifica ostello"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Modifica rifugio alpino"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Modifica area caravan e camper"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Campeggio"
@@ -24918,10 +24856,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Modifica campeggio"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Cibo+bevande"
@@ -24932,5 +24870,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ristorante"
@@ -24938,5 +24876,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Modifica ristorante"
@@ -24944,5 +24882,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cucina"
@@ -24950,73 +24888,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "cinese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "greca"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "tedesca"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "provinciale"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatica"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "tailandese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "messicana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "giapponese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "francese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "tramezzino"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast food"
@@ -25024,17 +24962,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Modifica fast food"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "fish-and-chips"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "pollo"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Caffetteria"
@@ -25042,9 +24980,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Caffetteria"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -25052,18 +24990,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Modifica Pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Modifica Biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -25071,9 +25009,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Modifica Bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Club notturno"
@@ -25081,24 +25019,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Modifica club notturno"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attrazione turistica"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Modifica attrazione turistica"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museo"
@@ -25106,9 +25044,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Modifica museo"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -25117,9 +25055,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Modifica zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Punto panoramico"
@@ -25127,24 +25065,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Modifica punto panoramico"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Torre di avvistamento"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Parco divertimenti"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Modifica parco divertimenti"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Opera d''arte"
@@ -25152,5 +25090,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Modifica opera d''arte"
@@ -25158,19 +25096,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Ufficio informazioni"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Mappa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Grado di dettaglio"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topografico"
@@ -25208,5 +25146,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25214,28 +25152,28 @@
 msgstr "strada"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "schema"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Area visualizzata"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "luogo"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "città"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "provincia"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Descrizione più specifica"
@@ -25245,5 +25183,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Itinerari segnalati per:"
@@ -25251,5 +25189,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Percorso escursionistico"
@@ -25257,6 +25195,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -25264,5 +25202,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -25270,6 +25208,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Sci"
@@ -25277,5 +25215,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Equitazione"
@@ -25283,46 +25221,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... altre modalità di trasporto possibili"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Tabellone informativo"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Contenuto del cartello"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "avviso"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "storia"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "natura"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "fauna"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "piantine"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Indicatore stradale"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Terminale informazioni"
@@ -25330,29 +25268,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Descrizione dettagliata"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audio-guida"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audio-guida tramite cellulare?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Numero di telefono"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Altri punti informativi"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Modifica pensilina/ricovero"
@@ -25360,25 +25298,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Caminetto"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Area picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Modifica area picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Luoghi storici"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Castello"
@@ -25387,19 +25325,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Modifica castello"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Rovine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Modifica rovine"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Sito archeologico"
@@ -25408,9 +25346,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Modifica sito archeologico"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Campo di battaglia"
@@ -25418,10 +25356,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Modifica campo di battaglia"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Sito paleontologico"
@@ -25429,5 +25367,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Modifica sito paleontologico"
@@ -25435,15 +25373,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Modifica monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memoriale"
@@ -25451,55 +25389,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Modifica memoriale"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Crocefisso"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Edicola votiva"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Modifica edicola votiva"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Pietra limite"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Modifica pietra limite"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Svago"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parco acquatico"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Modifica parco acquatico"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Parco giochi"
@@ -25507,35 +25445,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Modifica parco giochi"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Riserva di pesca"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Modifica riserva di pesca"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Articoli sportivi"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Strutture sportive"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Modifica stadio"
@@ -25549,6 +25487,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "seleziona uno sport:"
@@ -25940,6 +25878,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25973,225 +25911,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "polivalente"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "tiro con l''arco"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletica"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "football_australiano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "pallacanestro"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boccie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoa"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "arrampicata"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "reti_cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "cinodromo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "sport_equestri"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football_americano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "ginnastica"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "ippodromo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "autodromo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racchette"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "poligono_di_tiro"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "pattinaggio"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "comprensorio_sciistico"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "calcio"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "piscina"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "ping_pong"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centro sportivo"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Modifica centro sportivo"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Campo sportivo"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Modifica campo sportivo"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Circuito (pista)"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Modifica circuito (pista)"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Campo da golf"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Modifica campo da golf"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Modifica minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Struttura polivalente"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Modifica struttura polivalente"
@@ -26230,21 +26168,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tipo"
@@ -26283,203 +26221,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "campo_sportivo"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "centro_sportivo"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadio"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "tracciato"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Modifica bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletica"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Modifica atletica"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Tiro con l''arco"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Modifica tiro con l''arco"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Arrampicata"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Modifica arrampicata"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Canoa"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Modifca canoa"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Modifica ciclismo"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Corse dei cani"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Modifica corse dei cani"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Equitazione"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Modificare Equitazione"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Ippodromo"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Modifica ippodromo"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Ginnastica"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Modificare Ginnastica"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Sport motoristici"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Modifica Sport Motoristici"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Pattinaggio"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Modificare Pattinaggio"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Modificare Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Piscina"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Modificare Nuoto"
@@ -26487,52 +26425,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Modificare Sci"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Tipo di pista"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "Sci alpino"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Sci nordico"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snow_park"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Difficoltà"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "principante"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "facile"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "avanzato"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "esperto"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Poligono di tiro"
@@ -26540,177 +26478,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Modifica poligono di tiro"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sport (palla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Calcio"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Modifica Calcio"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Modifica football"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Football australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Modifica football australiano"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Modifica Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Pallacanestro"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Modifica Pallacanestro"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Modifica Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "campo_da_golf"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule (sport popolare in Francia)"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Modifica boule (sport popolare in Francia)"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bocce"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Modifica Bocce"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Modifica Cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Reti per Cricket"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Modifica Reti per Cricket"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Modifica croquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Modifica Hockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Modifica Pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Modifica racquet"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Modifica Rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tennis da tavolo"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Modifica Tenniis da tavolo"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Modifica Tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Artificiale"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Palazzo"
@@ -26718,5 +26656,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Edificio pubblico"
@@ -26724,10 +26662,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Modifica edificio pubblico"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Municipio"
@@ -26735,10 +26673,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Modifica municipio"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambasciata"
@@ -26746,10 +26684,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Modifica ambasciata"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Tribunale"
@@ -26758,10 +26696,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Modifica Palazzio del tribunale"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Prigione"
@@ -26770,10 +26708,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Modifica Prigione"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polizia"
@@ -26783,10 +26721,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Modifica Polizia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Vigili del fuoco"
@@ -26795,10 +26733,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Modifica vigili del fuoco"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Ufficio Postale"
@@ -26806,5 +26744,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Modifica Ufficio Postale"
@@ -26812,15 +26750,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Modifica asilo infantile"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Scuola"
@@ -26828,10 +26766,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Modifica scuola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Università"
@@ -26839,10 +26777,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Modifica Università"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Scuola superiore"
@@ -26850,5 +26788,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Modifica scuola superiore"
@@ -26856,5 +26794,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -26863,10 +26801,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Modifica Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -26875,9 +26813,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Modifica biblioteca"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro Artistico"
@@ -26885,10 +26823,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Modifica centro d''arte"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -26897,10 +26835,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Modifica Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Luogo di culto"
@@ -26910,5 +26848,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Modifica Luogo di culto"
@@ -26917,6 +26855,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religione"
@@ -26925,66 +26863,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "Bahaista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "Buddista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "Cristiana"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "Induista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "Giainista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "Ebraica"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "Mussulmana"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "Spiritualista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "Taoista"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "Unitariana"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "Zoroastrista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Denominazione"
@@ -26993,81 +26931,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "Anglicana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "Battista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "Cattolica"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "Evangelica"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Testimoni di Geova"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "Luterana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "Metodista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "Mormone"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "Ortodossa"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "Pentecostale"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "Prebiteriana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "Protestante"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "Quacchera"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "Sciita"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "Sunnita"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Indirizzi"
@@ -27076,5 +27014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Modifica dati indirizzo"
@@ -27082,5 +27020,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numero civico"
@@ -27088,25 +27026,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nome Casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nome Strada"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nome città"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Codice postale"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Codice nazione"
@@ -27115,5 +27053,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Modifica interpolazione indirizzo"
@@ -27121,61 +27059,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schema numerazione"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "dispari"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "pari"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetico"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Artificiale"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabbrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Modifica fabbrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Modifica torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Tipo di torre"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "telecomunicazioni"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "osservazione"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altezza (metri)"
@@ -27183,25 +27121,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre idrica"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Modifica torre idrica"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasometro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Modifica gasometro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Faro"
@@ -27209,10 +27147,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Modifica faro"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Mulino a vento"
@@ -27220,10 +27158,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Modifica mulino a vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Conduttura"
@@ -27232,41 +27170,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Modifica conduttura"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "calore"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "petrolio"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "liquami"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "qualunque sostanza"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Posizione"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "subacqueo"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "sopra il suolo"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Depuratore acqua"
@@ -27276,10 +27214,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Modifica depuratore acqua"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Gru permanente"
@@ -27287,5 +27225,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Modifica gru permanente"
@@ -27293,10 +27231,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Modifica torre radio"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Punto geodetico o altra stazione fissa"
@@ -27304,10 +27242,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Modifica punto geodetico o altra stazione fissa"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Telecamera di sorveglianza"
@@ -27315,23 +27253,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Modifica telecamera di sorveglianza"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "interno"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "esterno"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "pubblico"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Centrale elettrica"
@@ -27341,35 +27279,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Modifica centrale elettrica"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "eolica"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "idroelettrica"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "a combustibile fossile"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "fissione nucleare"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "carbone"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "fotovoltaico"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Stazione elettrica"
@@ -27378,10 +27316,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Modifica stazione elettrica"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Sottostazione elettrica"
@@ -27390,5 +27328,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Modifica sottostazione elettrica"
@@ -27396,10 +27334,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Riferimento linea"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Pilone (elettricità)"
@@ -27410,23 +27348,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Modifica pilone (elettricità)"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "traliccio"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "palo"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Riferimento torre"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Linea elettrica"
@@ -27435,74 +27373,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Modifica linea elettrica"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Tipo di linea"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "linea"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "linea minore"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Quantità di cavi"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Numero di fili (conduttori) per cavo elettrico"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "singola"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "doppia"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "tripla"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quadrupla"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Servizi"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Bagni pubblici"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limitato"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Cassetta Postale"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefono"
@@ -27511,5 +27449,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Modifica Telefono"
@@ -27517,5 +27455,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Monete"
@@ -27523,5 +27461,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Note"
@@ -27529,5 +27467,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Portafogli elettronici e carte di debito"
@@ -27535,5 +27473,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Carte di debito"
@@ -27541,15 +27479,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Carte di credito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Carte telefoniche"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Riciclaggio"
@@ -27558,5 +27496,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Modifica Stazione di riciclaggio"
@@ -27564,35 +27502,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Lattine"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Vestiti"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Vetro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Carta"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Rottami metallici"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Cestino della spazzatura"
@@ -27600,5 +27538,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Modifica cestino della spazzatura"
@@ -27607,31 +27545,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Schienale"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Materiale"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "pietra"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plastica"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Colore"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "nero"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "marrone"
@@ -27710,5 +27648,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27718,31 +27656,31 @@
 msgstr "verde"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "rosso"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "blu"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "grigio"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "bianco"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Quantità di posti"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Postazione di caccia"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Modifica una postazione di caccia"
@@ -27751,30 +27689,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Modifica Albero"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "basso"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "mezzo"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "completo"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Nascondi"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Blocco"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontana"
@@ -27783,10 +27721,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Modifica Fontana"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Acqua potabile"
@@ -27795,10 +27733,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Modifica acqua potabile"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Pompa antincendio"
@@ -27807,5 +27745,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Modifica pompa antincendio"
@@ -27813,5 +27751,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Culla per la vita"
@@ -27819,15 +27757,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Modifica culla per la vita"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Negozi"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Concessionaria"
@@ -27835,10 +27773,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Modifica concessionaria"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Negozio di biciclette"
@@ -27847,28 +27785,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Modifica negozio di biciclette"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermercato"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Modifica Supermercato"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Farmacista"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Modifica farmacista"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Minimarket"
@@ -27876,9 +27814,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Modifica minimarket"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Chiosco"
@@ -27886,27 +27824,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Modificia Chiosco"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Libreria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Modifica libreria"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Agenzia di viaggi"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Modifica agenzia di viaggi"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Macellaio"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Modifica Macellaio"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Panificio"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Modifica Panificio"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Fiorista"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Modifica Fiorista"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Prodotti biologici"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Modifica negozio di prodotti biologici"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alcolici (non in Italia)"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Modifica negozio di alcolici (non in Italia)"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Bevande"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Modifica negozio di bevande"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Modifica negozio di informatica"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elettronica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Modifica Negozio di Elettronica"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hi-Fi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Modifica negozio di Hi-Fi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Mobilia"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Modifica Negozio di Mobilia"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Giardinaggio"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Modifica giardinaggio"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Ferramenta"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Modifica Negozio di Ferramenta"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Fai-da-te"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Modifica negozio Fai-da-te"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Cartoleria"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Modifica cartoleria"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Parrucchiere/barbiere"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Modifica parrucchiere/barbiere"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Calzature"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Modifica Negozio di Scarpe"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Giocattoli"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Modifica Negozio di Giocattoli"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Videoteca"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Modifica videoteca"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Lavanderia a secco"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Modifica Lavanderia a secco"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Lavanderia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Modifica lavanderia"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Sport all''aperto"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Modifica sport all''aperto"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Modifica articoli sportivi"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Ottico"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Modifica Ottico"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Distributore automatico"
@@ -27914,5 +28066,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Modifica Distributore automatico"
@@ -27920,306 +28072,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Distributore automatico"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "Biglietti trasporto pubblico"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "Orari trasporto pubblico"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "Biglietti per il parcheggio"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "Alimenti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "Bevande"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "Dolci"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "Sigarette"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotografie"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "Cibo per animali"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "Giornali"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "giocattoli"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "francobolli"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "Schede SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "buoni_telefonici"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "buoni"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicicletta"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "preservativi"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "assorbenti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "Sacchetto per escrementi"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Conto o carta fedeltà"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Macellaio"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Modifica Macellaio"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Panificio"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Modifica Panificio"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Fiorista"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Modifica Fiorista"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Prodotti biologici"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Modifica negozio di prodotti biologici"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alcolici (non in Italia)"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Modifica negozio di alcolici (non in Italia)"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Bevande"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Modifica negozio di bevande"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Modifica negozio di informatica"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elettronica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Modifica Negozio di Elettronica"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hi-Fi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Modifica negozio di Hi-Fi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Mobilia"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Modifica Negozio di Mobilia"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Giardinaggio"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Modifica giardinaggio"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Ferramenta"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Modifica Negozio di Ferramenta"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Fai-da-te"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Modifica negozio Fai-da-te"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Cartoleria"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Modifica cartoleria"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Parrucchiere/barbiere"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Modifica parrucchiere/barbiere"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Calzature"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Modifica Negozio di Scarpe"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Giocattoli"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Modifica Negozio di Giocattoli"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Videoteca"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Modifica videoteca"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Lavanderia a secco"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Modifica Lavanderia a secco"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Lavanderia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Modifica lavanderia"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Sport all''aperto"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Modifica sport all''aperto"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Modifica articoli sportivi"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Ottico"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Modifica Ottico"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Contanti"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banca"
@@ -28227,14 +28171,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Modifica banca"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Bancomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Cambiavalute"
@@ -28242,5 +28186,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Modifica cambiavalute"
@@ -28248,15 +28192,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Modifica bancomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Salute"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Ambulatorio"
@@ -28264,18 +28208,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Modifica ambulatorio"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dentista"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Modifica dentista"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Farmacia"
@@ -28283,5 +28227,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Modifica Farmacia"
@@ -28289,9 +28233,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Vendita medicinali con obbligo di prescrizione"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Ospedale"
@@ -28299,10 +28243,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Modifica Ospedale"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Colonnina SOS"
@@ -28311,5 +28255,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Modifica colonnina SOS"
@@ -28318,20 +28262,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Numero del punto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Nome del punto"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Numero di telefono"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Usare prefisso internazionale, es. +12-345-67890)"
@@ -28339,5 +28283,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinario"
@@ -28346,64 +28290,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Modifica veterinario"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Luoghi"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Modifica continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Nazione"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Modifica nazione"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Regione"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Modifica regione"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Provincia"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Modifica provincia"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Contea (in Italia NON usare)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Modifica contea (in Italia NON usare)"
@@ -28411,15 +28355,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Città"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Modifica città"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Paese"
@@ -28427,10 +28371,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Modifica paese"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Quartiere"
@@ -28438,25 +28382,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Modifica quartiere"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Frazione"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Modifica frazione"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Borgo"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Modifica borgo"
@@ -28464,5 +28408,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Località (luogo con nome, non popolato)"
@@ -28470,10 +28414,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Modifica località (luogo con nome, non popolato)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Isola"
@@ -28481,10 +28425,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Modifica isola"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Isoletta"
@@ -28492,5 +28436,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Modifica isoletta"
@@ -28498,5 +28442,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Entrata di una grotta/caverna"
@@ -28504,10 +28448,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Modifica entrata di una grotta/caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Picco montuoso"
@@ -28515,10 +28459,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Modifica picco montuoso"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Ghiacciaio"
@@ -28526,10 +28470,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Modifica Ghiacciaio"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulcano"
@@ -28537,70 +28481,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Modifica vulcano"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Confini"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nazionale"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Modifica confine nazionale"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Amministrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Modifica confine amministrativo"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civile"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Modifica confine civile"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politico"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Modifica confine politico"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Parco nazionale"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Modifica Confine Parco Nazionale"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Uso del terreno"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Albero"
@@ -28609,15 +28553,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Modifica albero singolo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Nome Botanico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Bosco"
@@ -28626,5 +28570,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Modifica bosco"
@@ -28632,17 +28576,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Conifere"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "deciduo (caducifoglie)"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "Mista"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Foresta"
@@ -28651,14 +28595,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Modifica area di foresta"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Riserva naturale"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Modifica riserva naturale"
@@ -28666,25 +28610,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Ghiaione"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Modifica ghiaione"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Boscaglia"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Modifica boscaglia"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Prato alpino"
@@ -28692,10 +28636,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Modifica prato alpino"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Brughiera"
@@ -28703,5 +28647,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Modifica brughiera"
@@ -28709,5 +28653,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Aia"
@@ -28716,45 +28660,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Modifica aia"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Area agricola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Modifica area agricola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Prato"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Modifica area a prato"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vigna"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Modifica area di vigneto"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Area pubblica concessa ai cittadini per la realizzazione di orti"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -28763,25 +28707,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Giardino"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Modifica giardino"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Erba"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Modifica area di prato"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Village Green"
@@ -28789,10 +28733,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Modifica Village Green"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Area comune (UK)"
@@ -28800,20 +28744,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Modifica area comune (UK)"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Parco"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Modifica parco"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Area di svago"
@@ -28821,5 +28765,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Modifica area di svago"
@@ -28827,15 +28771,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Area residenziale"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Modifica area residenziale"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Cimitero"
@@ -28843,9 +28787,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Modifica Cimitero"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cimitero"
@@ -28853,39 +28797,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Modifica area di cimitero (esteso)"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Commerciale (negozi)"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Modifica area commerciale (negozi)"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Commerciale (uffici)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Modifica area commerciale (uffici)"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industriale"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Modifica area industriale"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Deposito materiale ferroviario"
@@ -28893,15 +28837,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Modifica deposito materiale ferroviario"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militare"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Modifica area militare"
@@ -28909,50 +28853,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Area in costruzione"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Modifica area in costruzione"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Ridestinazione d''uso"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Modifica area di ridestinazione d''uso"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Modifica area agricola destinata alla costruzione"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Discarica"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Modifica area di discarica"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Cava"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Modifica area di cava/miniera"
@@ -28962,5 +28906,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Modifica un multi-poligono"
@@ -28969,10 +28913,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "segmento esterno"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "segmento interno"
@@ -28980,5 +28924,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Divieto di svolta"
@@ -28987,5 +28931,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Modifica un divieto di svolta"
@@ -28993,34 +28937,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Divieto"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "no svolta a sinistra"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "no svolta a destra"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "non diritto"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "no inversione di marcia"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "solo svolta a destra"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "solo svolta a sinistra"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "solo diritto"
@@ -29029,15 +28973,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "dal percorso"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "attraverso il nodo o percorso"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "verso il percorso"
@@ -29045,5 +28989,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Itinerario"
@@ -29052,5 +28996,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Modifica un itinerario"
@@ -29058,5 +29002,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Tipo di itinerario"
@@ -29147,5 +29091,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -29155,17 +29099,17 @@
 msgstr "bicicletta"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "strada"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "traghetto"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "sci"
@@ -29225,5 +29169,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -29232,9 +29176,9 @@
 msgstr "pedone"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "deviazione"
@@ -29248,10 +29192,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metropolitana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Descrizione del simbolo"
@@ -29259,31 +29203,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Rete"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Stato dell''itinerario"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "proposto"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternativo"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporaneo"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "collegamento"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Colore (esadecimale)"
@@ -29292,32 +29236,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "segmento di itinerario"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "segmento diretto"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "segmento opposto"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "punto di fermata"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "punto di fermata diretto"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "punto di fermata opposto"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
@@ -33340,4 +33359,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicilia - Italia"
+
+#~ msgid "Bikes"
+#~ msgstr "Biciclette"
 
 #~ msgid "No data imported."
Index: /applications/editors/josm/i18n/po/ja.po
===================================================================
--- /applications/editors/josm/i18n/po/ja.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/ja.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-14 03:59+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-20 03:41+0000\n"
 "Last-Translator: higa4 <higa432@gmail.com>\n"
 "Language-Team: Japanese <tr@openstreetmap.jp>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:45+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: JAPAN\n"
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1207,5 +1207,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "オブジェクトを世界の外に移動できません。"
@@ -1530,5 +1530,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2291,9 +2291,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2375,26 +2375,26 @@
 msgstr "描画の完了"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "押し出し"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "エリアの作成"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "ウェイを押し出す"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "セグメントを垂線に沿って移動し、マウスボタンを離してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "任意の大きさの四角形を描いて、マウスボタンを離してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2416,6 +2416,6 @@
 "を押しながらドラッグ状態をリリースするとそのポイントに音声が同期します."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2427,9 +2427,9 @@
 msgstr "選択"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "オブジェクトの選択、移動および回転"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2437,17 +2437,17 @@
 msgstr[0] "仮の新規ノードを ウェイに追加し、動かしてください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "要素を移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "これらを移動する。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "移動を取り消す"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2460,9 +2460,9 @@
 "本当に移動しますか？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "矩形範囲でオブジェクトを選択し、マウスボタンを離してください。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2471,9 +2471,9 @@
 "マージします。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "回転を止めるには、マウスボタンを放します。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -2852,5 +2852,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:658
 msgid "Range of numbers expected"
-msgstr ""
+msgstr "予期される数字の範囲"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661
@@ -3233,5 +3233,5 @@
 msgstr "適用しますか?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3486,5 +3486,5 @@
 #: ../core/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java:25
 msgid "Projected Coordinates"
-msgstr ""
+msgstr "射影された座標"
 
 #. short symbol for South
@@ -3833,17 +3833,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "標準"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "接続"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "まだタグ付けされていない画像"
+msgstr ""
 
 #. teal
@@ -4027,5 +4024,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "鉄道"
@@ -5338,5 +5335,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "全て"
@@ -5760,4 +5757,9 @@
 msgstr "フィルターモード"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5848,5 +5850,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "リレーション"
@@ -5948,9 +5950,9 @@
 msgstr "選択: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "パネルの取り外し"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5959,5 +5961,5 @@
 "ます。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "クリックすることでパネルの内容を最小化/最大化"
@@ -6292,4 +6294,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6302,10 +6310,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6975,145 +6977,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "名前"
@@ -8370,10 +8372,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "タイプ"
@@ -8381,5 +8383,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8393,17 +8394,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "不明な"
@@ -9224,11 +9224,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9245,14 +9247,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "レイヤー"
@@ -9812,5 +9814,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "説明"
@@ -10894,21 +10896,21 @@
 msgstr "ダイアログを閉じてアクセストークンを受入れ"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "警告: OAuth操作実行のキャンセルに失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "注意: ''{0}'' からのOAuth接続トークンです"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "''{0}'' よりOAuthアクセストークン参照中"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
@@ -10917,34 +10919,34 @@
 "た"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr "OAuth ユーザー ''{0}'' パスワード ''***'' での認証に失敗しました。"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "OAuthリクエスト''{0}'' の認証に失敗"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "OSMウェブサイトでOAuth リクエストトークン ''{0}''を認証中"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "OSMウェブサイトのセッションを初期化中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "ユーザ''{0}'' 用のセッションを認証中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "リクエストトークン''{0}'' を認証中..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11438,5 +11440,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "自動車"
@@ -11458,16 +11460,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "自転車"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11497,12 +11500,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "徒歩"
@@ -12200,17 +12203,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "OAuthの詳細設定"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "ストリートの名前"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "測定した値"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -13603,10 +13603,10 @@
 #, java-format
 msgid "({0}/{1}) Downloading changeset {2} ..."
-msgstr ""
+msgstr "({0}/{1}) 変更セット {2} をダウンロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java:185
 #, java-format
 msgid "Downloading content for changeset {0} ..."
-msgstr ""
+msgstr "変更セット {0} 用の内容をダウンロード中 ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:68
@@ -14605,6 +14605,7 @@
 msgstr "トレースのアップロード"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "表示"
@@ -14695,5 +14696,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "アドレスの補間"
@@ -14880,5 +14881,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "建物を作成"
@@ -14919,19 +14920,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "建物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14939,5 +14940,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14952,10 +14953,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "用紙選択"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14999,7 +15000,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert Zone 2 cache file (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15150,5 +15150,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16569,5 +16569,5 @@
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyPlugin.java:22
 msgid "Convert to multipolygon"
-msgstr ""
+msgstr "マルチポリゴンに変換"
 
 #: ../plugins/multipoly-convert/src/converttomultipoly/MultipolyAction.java:39
@@ -16761,5 +16761,5 @@
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:65
 msgid "You have unsaved changes in your queue. Do you want to submit them now?"
-msgstr ""
+msgstr "あなたのキューには保存されていない変更があります。今すぐ登録しますか？"
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/ToggleConnectionModeAction.java:66
@@ -16933,5 +16933,5 @@
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:124
 msgid "Image not created properly."
-msgstr ""
+msgstr "画像は正しく作成されませんでした。"
 
 #: ../plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java:138
@@ -17026,5 +17026,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "公共交通機関"
@@ -17067,14 +17067,14 @@
 #, java-format
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "入出力例外 \"{0}\" が発生しました。"
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
 msgid "Tracks"
-msgstr ""
+msgstr "トラック"
 
 #. item "Ways/Steps" text "Width (meters)"
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "ウェイポイント"
@@ -17429,5 +17429,5 @@
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291
 msgid "Abort tag editing and close dialog"
-msgstr ""
+msgstr "タグ編集を中断してダイアログを閉じる"
 
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304
@@ -17633,5 +17633,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
 msgid "Create/Edit turn restriction..."
-msgstr ""
+msgstr "転回制限を作成/編集..."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
@@ -17649,4 +17649,22 @@
 "In the following table you can edit the <strong>raw members</strong> of the "
 "OSM relation representing this turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "タイプ"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "元: ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
 msgstr ""
 
@@ -17670,5 +17688,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:102
 msgid "Clear the selected roles or delete the selected members"
-msgstr ""
+msgstr "選択されたロールをクリアするか選択されたメンバーを削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberTable.java:128
@@ -17686,5 +17704,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
 msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "転回制限の基本属性を編集"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
@@ -17698,20 +17716,20 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:142
 msgid "Show errors and warnings related to this turn restriction"
-msgstr ""
+msgstr "この転回制限に関するエラーと警告を表示"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:280
 #, java-format
 msgid "Create a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "レイヤ ''{0}'' に新しい転回制限を作成"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:282
 #, java-format
 msgid "Edit a new turn restriction in layer ''{0}''"
-msgstr ""
+msgstr "レイヤ ''{0}'' の新しい転回制限を編集"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:284
 #, java-format
 msgid "Edit turn restriction ''{0}'' in layer ''{1}''"
-msgstr ""
+msgstr "レイヤ ''{1}'' 転回制限 ''{0}'' を編集"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398
@@ -17736,5 +17754,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:411
 msgid "Save the turn restriction despite of errors and/or warnings"
-msgstr ""
+msgstr "エラーや警告に関わらず転回制限を保存"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:415
@@ -17766,4 +17784,6 @@
 "removed.<br>How to you want to proceed?"
 msgstr ""
+"この転回制限への更新は削除済みのメンバーが除去されるまで保存できません。<br>"
+"先に進みますか？"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:502
@@ -17779,13 +17799,13 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:518
 msgid "Deleted members in turn restriction"
-msgstr ""
+msgstr "転回制限中の削除済みメンバー"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:597
 msgid "Create a conflict and close this turn restriction editor"
-msgstr ""
+msgstr "競合を作成し、この転回制限エディタを閉じる"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:603
 msgid "Return to the turn restriction editor and resume editing"
-msgstr ""
+msgstr "転回制限エディタに戻り編集を再開"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:610
@@ -17795,4 +17815,6 @@
 "a conflict and close the editor?</html>"
 msgstr ""
+"<html>この転回制限はエディタの外部で変更されています。<br>変更を適用して編集"
+"を続けることはできません。<br><br>競合を作成してエディタを閉じますか？</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
@@ -17802,7 +17824,23 @@
 "resolve this conflict first, then try again.</html>"
 msgstr ""
+"<html>レイヤ ''{0}'' には既に次のオブジェクトの競合があります<br>''{1}''。"
+"<br>最初に競合を解決してからやり直してください。</html>"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr "既に競合に参加しています"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "転回制限から削除"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "転回制限から削除"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17830,9 +17868,9 @@
 #, java-format
 msgid "multiple objects with role ''{0}''"
-msgstr ""
+msgstr "ロール ''{0}'' をもつ複数のオブジェクト"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:245
 msgid "Delete from turn restriction"
-msgstr ""
+msgstr "転回制限から削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:354
@@ -17842,9 +17880,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:220
 msgid "Create new turn restriction"
-msgstr ""
+msgstr "新しい展開制限を作成"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionSelectionPopupPanel.java:221
 msgid "Launch the turn restriction editor to create a new turn restriction"
-msgstr ""
+msgstr "転回制限エディタを起動して新しい展開制限を作成"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionType.java:11
@@ -17879,9 +17917,9 @@
 #, java-format
 msgid "Warning: failed to load icon for turn restriction type ''{0}''"
-msgstr ""
+msgstr "警告: 転回制限種別 ''{0}'' 用のアイコンのロードに失敗"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionTypeRenderer.java:75
 msgid "please select a turn restriction type"
-msgstr ""
+msgstr "転回制限種別を選んでください"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
@@ -17889,5 +17927,5 @@
 "Select the vehicle types this turn restriction is <strong>not</strong> "
 "applicable for."
-msgstr ""
+msgstr "この転回制限が<strong>適さない</strong>乗り物の種別を選択。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
@@ -17921,5 +17959,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
 msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "現在選択中の経由地を削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
@@ -17933,9 +17971,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
 msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "選択中の経由地をクリップボードにコピー"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
 msgid "Insert 'via' objects from the clipboard"
-msgstr ""
+msgstr "クリップボードから'経由地'オブジェクトを挿入"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
@@ -17980,21 +18018,21 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:107
 msgid "Turn Restrictions"
-msgstr ""
+msgstr "転回制限"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:164
 msgid "Display and manage turn restrictions in the current data set"
-msgstr ""
+msgstr "現在のデータセット中の転回制限を表示して管理"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:217
 msgid "Open an editor for the selected turn restricion"
-msgstr ""
+msgstr "選択中の転回制限用にエディタを開く"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:276
 msgid "Delete the selected turn restriction"
-msgstr ""
+msgstr "選択中の転回制限を削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:314
 msgid "Create a new turn restriction"
-msgstr ""
+msgstr "新しい転回制限を作成"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:353
@@ -18008,5 +18046,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:386
 msgid "Zoom to the currently selected turn restrictions"
-msgstr ""
+msgstr "現在選択中の転回制限にズーム"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
@@ -18026,5 +18064,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:106
 msgid "An OSM plugin for editing turn restrictions."
-msgstr ""
+msgstr "転回制限編集用のOSMプラグイン。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:50
@@ -18037,5 +18075,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr ""
+msgstr "基本エディタにある経由地オブジェクトのリストを表示して編集"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
@@ -18067,5 +18105,5 @@
 msgctxt "keyboard-key"
 msgid "Key:"
-msgstr ""
+msgstr "キー:"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:75
@@ -18145,5 +18183,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
 msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "基本エディタに移動し、手動で転回制限種別を選ぶ"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
@@ -18160,5 +18198,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
 msgid "Set via-Object"
-msgstr ""
+msgstr "経由地オブジェクトをセット"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
@@ -18170,5 +18208,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
+msgstr "基本エディタに移動して、手動で経由地オブジェクトのリストを修正"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -18177,4 +18215,5 @@
 "type in the Basic Editor."
 msgstr ""
+"転回制限には制限種別の宣言が必要です。基本エディタで種別を選択してください。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
@@ -18188,5 +18227,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
 msgid "Please go to the Basic editor and manually choose an OSM way."
-msgstr ""
+msgstr "基本エディタに移動してOSMウェイを手動で選んでください。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
@@ -18218,5 +18257,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
 msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "拡張エディタに移動してメンバーを削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
@@ -18234,5 +18273,5 @@
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "必要なタグ<tt>{0}={1}</tt> がありません。"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
@@ -18282,9 +18321,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
 msgid "Delete the member from the turn restriction"
-msgstr ""
+msgstr "転回制限からメンバーを削除"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
 msgid "Change to the Basic Editor and select an OSM way"
-msgstr ""
+msgstr "基本エディタに変更し、OSMウェイを選択"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -18560,5 +18599,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "マルチポリゴン"
@@ -18594,5 +18633,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
 msgid "Missing name:* translation."
-msgstr ""
+msgstr "次の名前がありません: * translation。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:37
@@ -18605,5 +18644,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
 msgid "A name:* translation is missing."
-msgstr ""
+msgstr "名前: * translation がありません。"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:74
@@ -19903,7 +19942,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "道路番号"
@@ -19920,5 +19959,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "車線数"
@@ -19936,4 +19975,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19941,9 +19981,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "最高速度（km/h）"
@@ -19971,15 +20010,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19990,11 +20023,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "一方通行"
@@ -20014,15 +20046,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20039,11 +20069,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20064,8 +20094,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20083,11 +20113,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "トンネル"
@@ -20107,6 +20137,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20124,11 +20154,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "切り通し"
@@ -20148,6 +20178,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20165,11 +20195,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "土手"
@@ -20307,5 +20337,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -20314,12 +20344,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20327,13 +20360,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "幅(m)"
@@ -20362,24 +20395,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "表面"
@@ -20391,5 +20420,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20403,11 +20432,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "舗装"
@@ -20415,10 +20443,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "未舗装"
@@ -20426,10 +20454,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "アスファルト"
@@ -20437,11 +20465,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "コンクリート"
@@ -20449,10 +20476,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "金属"
@@ -20460,10 +20487,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "森"
@@ -20471,10 +20498,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "敷石"
@@ -20482,11 +20509,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "敷石"
@@ -20494,10 +20520,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "砂利道"
@@ -20505,10 +20531,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "小石"
@@ -20516,10 +20542,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "圧縮"
@@ -20527,10 +20553,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "敷石混じりの芝"
@@ -20538,10 +20564,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "草地"
@@ -20549,10 +20575,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "砂地"
@@ -20560,10 +20586,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "地表"
@@ -20644,6 +20670,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "道路（種別不明)"
@@ -20652,5 +20677,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "種別不明道路の編集"
@@ -20658,6 +20683,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "工事中"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "工事中道路の編集"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "ジャンクション"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "ロータリー交差点"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "通行制限"
@@ -20666,15 +20720,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "通行制限の編集"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "料金"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "行き止まり(cul-de-sac)"
@@ -20682,5 +20736,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "アクセス"
@@ -20722,28 +20776,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "はい"
@@ -20756,10 +20809,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20773,10 +20826,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20800,97 +20853,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "関係車両のみ可"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "農業の"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "いいえ"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "指定済み"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "貨物トラック"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車"
@@ -20905,10 +20958,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "馬"
@@ -20924,10 +20977,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "自動二輪"
@@ -20942,19 +20995,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "自動車"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "公共交通機関(psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "最小速度（km/h)"
@@ -20962,20 +21015,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "最大重量（トン）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "最大高（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "最大幅（ｍ）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "最大長（ｍ）"
@@ -20983,5 +21036,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "ロータリー交差点"
@@ -20992,5 +21045,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "ジャンクションの編集"
@@ -21010,10 +21063,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "自動車専用道路"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "自動車専用道路の連結路"
@@ -21035,10 +21088,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "国道"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "国道の連絡路"
@@ -21060,10 +21113,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "主要地方道"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "主要地方道の連絡路"
@@ -21085,5 +21138,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21098,9 +21151,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "一般道(2車線以上)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "一般道(2車線未満)"
@@ -21114,9 +21167,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住区域内道路"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "私道"
@@ -21146,10 +21199,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "敷地内道路"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "バスレーン"
@@ -21179,5 +21232,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21189,10 +21242,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "橋の編集"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "トンネルの編集"
@@ -21200,39 +21253,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "ウェイ"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "工事中"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "工事中道路の編集"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "ジャンクション"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "ロータリー交差点"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "トラック"
@@ -21241,73 +21265,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "トラックの編集"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "トラック種別"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "grade1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "grade2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "grade3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "grade4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "grade5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "ハイキング"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "小道"
@@ -21316,38 +21308,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "小道の編集"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "ハイキング"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "中間"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "スキー"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "スノーモービル"
@@ -21356,5 +21378,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21362,5 +21384,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "馬道の編集"
@@ -21368,5 +21390,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21384,11 +21406,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "自転車道の編集"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "歩行者専用道路"
@@ -21396,5 +21418,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21402,5 +21424,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21408,5 +21430,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -21415,15 +21437,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "遊歩道の編集"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "自転車"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "階段"
@@ -21433,10 +21451,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "階段を編集"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "自動車専用道路のジャンクション"
@@ -21444,15 +21462,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "自動車専用道路ジャンクションの編集"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "数"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "敷地内道路"
@@ -21460,5 +21478,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "サービスステーションの編集"
@@ -21498,17 +21516,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "操作員"
@@ -21517,5 +21535,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "信号機"
@@ -21525,5 +21543,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "横断歩道タイプ"
@@ -21532,27 +21550,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "マークだけ"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "信号機"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "途中に島あり"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "マークなし"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "馬用横断道"
@@ -21560,6 +21578,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "自転車用横断歩道"
@@ -21568,11 +21586,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "踏切係員"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "踏切タイプ名(UK)"
@@ -21580,30 +21598,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "横断歩道"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "ペリカン柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "Toucan柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "ツノメドリ"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "ペガサス柄横断歩道（ＵＫ）"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "虎縞柄横断歩道（ＵＫ）"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "停止"
@@ -21611,5 +21629,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "横断歩道"
@@ -21618,14 +21636,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "踏切の編集"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "タイプ名(UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21633,33 +21651,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21667,5 +21685,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21673,5 +21691,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "小さなラウンドアバウト"
@@ -21682,14 +21700,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "時計回り"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "転回場"
@@ -21699,5 +21717,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "市境界標識"
@@ -21705,15 +21723,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "市境界標識の編集"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "二つ目の名前"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "スピードカメラ（オービス）"
@@ -21722,5 +21740,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -21728,5 +21746,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "坂"
@@ -21734,5 +21752,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "急な坂"
@@ -21740,5 +21758,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21748,10 +21766,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "浅瀬（洗い越し）"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "浅瀬（歩いて渡る）"
@@ -21759,5 +21777,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "峠道"
@@ -21765,5 +21783,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "峠道の編集"
@@ -21775,7 +21793,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "高度"
@@ -21783,5 +21801,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "ゲート等"
@@ -21789,5 +21807,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "車止め杭"
@@ -21795,5 +21813,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "bollardの編集"
@@ -21838,16 +21856,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "許可された通行："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "自転車止め"
@@ -21856,5 +21874,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "ブロック"
@@ -21863,5 +21881,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Cattle Grid(家畜用格子柵)"
@@ -21869,5 +21887,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Cattle Gridの編集"
@@ -21875,5 +21893,5 @@
 # http://en.wikipedia.org/wiki/Bus_trap
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "バスだけが通行可能になる落とし穴"
@@ -21881,15 +21899,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "車止めのとげ"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "車止めのとげの編集"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "料金所"
@@ -21897,5 +21915,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "料金所の編集"
@@ -21903,10 +21921,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "国境検査所"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "国境検査所の編集"
@@ -21916,5 +21934,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "生け垣"
@@ -21925,22 +21943,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "フェンス"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "壁"
@@ -21948,5 +21966,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "城壁"
@@ -21955,5 +21973,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "擁壁"
@@ -21965,10 +21983,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "入り口の編集"
@@ -21976,5 +21994,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "ゲート"
@@ -21982,50 +22000,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "ゲートの編集"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "引き上げゲート"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "引き上げゲートの編集"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Hampshire Gate"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Gateの編集"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "竹のゲート"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "竹のゲートの編集"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "幅の狭いゲート"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "幅の狭いゲートの編集"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "踏み越し段"
@@ -22033,25 +22051,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Stileの編集"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "回転式木戸"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "回転式木戸を編集"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "城の出撃路"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "城の出撃路の編集"
@@ -22062,11 +22080,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "水域(湖沼)"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "泉"
@@ -22074,5 +22092,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "泉の編集"
@@ -22080,5 +22098,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "側溝"
@@ -22086,10 +22104,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "川(drain)の編集"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -22097,10 +22115,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "小川"
@@ -22108,10 +22126,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "小川の編集"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "運河"
@@ -22119,10 +22137,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "運河の編集"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "川"
@@ -22132,5 +22150,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "河川の編集"
@@ -22138,15 +22156,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "水域の編集"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "陸地の編集"
@@ -22154,5 +22172,5 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "水たまり、窪地"
@@ -22160,10 +22178,10 @@
 # 水たまりになるような土地
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "窪地、水盤場の盆地"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "ため池"
@@ -22171,15 +22189,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "ため池の編集"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "蓋付きため池"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "蓋のされたため池の編集"
@@ -22187,5 +22205,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "川岸"
@@ -22194,10 +22212,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "川岸の編集"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "湿地帯"
@@ -22208,14 +22226,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "湿地帯の編集"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "沼地"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "湿地"
@@ -22229,35 +22247,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "沼地、湿地"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "葦原"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "塩湖"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "干潟"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "マングローブ"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "泥地"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "泥地の編集"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "砂浜"
@@ -22265,20 +22283,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "砂浜の編集"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "湾"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "湾の編集"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "崖"
@@ -22286,10 +22304,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "崖の編集"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "海岸線"
@@ -22297,5 +22315,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "海岸線の編集"
@@ -22303,5 +22321,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "フェリー航路"
@@ -22309,5 +22327,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "フェリー航路の編集"
@@ -22316,5 +22334,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "ボートヤード(陸上の船置き場)"
@@ -22322,10 +22340,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "ボートヤードの編集"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "ドック"
@@ -22333,5 +22351,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "ドックの編集"
@@ -22339,5 +22357,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "ダム"
@@ -22345,15 +22363,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "ダムの編集"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "水路ポイント"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "ロックゲート"
@@ -22362,5 +22380,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "堰"
@@ -22368,20 +22386,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "ダムの編集"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "滝"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "滝の編集"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "転回地点"
@@ -22390,15 +22408,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "マリーナ"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "マリーナの編集"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "桟橋"
@@ -22406,10 +22424,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "桟橋の編集"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "フェリーターミナル"
@@ -22417,10 +22435,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "フェリーターミナルの編集"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "スリップウェイ(進水所)"
@@ -22430,20 +22448,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "スリップウェイの編集"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "輸送"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "鉄道"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "線路"
@@ -22451,5 +22469,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "線路の編集"
@@ -22479,86 +22497,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "標準"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22570,8 +22513,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22585,29 +22528,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "中庭"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "待避線"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "分岐線"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22620,8 +22563,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22692,8 +22635,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22705,8 +22648,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "電圧"
@@ -22719,8 +22662,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "周波数 (Hz)"
@@ -22733,23 +22676,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "トロッコ線路（狭軌）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "モノレール"
@@ -22757,50 +22700,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "モノレールの編集"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "保存鉄道"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "保存鉄道の編集"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "路面電車（ライトレール）"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "路面電車（ライトレール）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "地下鉄"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "地下鉄の編集"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "路面電車（トラム）"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "路面電車（トラム）の編集"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "バスレーン"
@@ -22808,5 +22751,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "バス車線の編集"
@@ -22815,10 +22758,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "使われていない線路"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "使われていない線路の編集"
@@ -22827,9 +22770,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "追加のタイプ"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "廃棄された線路"
@@ -22838,5 +22781,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "踏切"
@@ -22845,5 +22788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "踏切（遮断機なし）"
@@ -22853,5 +22796,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "踏切のタイプ"
@@ -22859,5 +22802,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "転車台（ターンテーブル）"
@@ -22866,5 +22809,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22873,10 +22816,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "リフト"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "いすリフト"
@@ -22884,10 +22827,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "いすリフトの編集"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Tバーリフト"
@@ -22895,10 +22838,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Tバーリフト"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "ケーブルカー"
@@ -22906,10 +22849,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "ケーブルカーの編集"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "ゴンドラ"
@@ -22917,10 +22860,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "ゴンドラを編集"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22929,5 +22872,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22935,5 +22878,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22942,5 +22885,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22948,5 +22891,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "ガソリンスタンド"
@@ -22956,62 +22899,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "ガソリンスタンドの編集"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -23069,32 +23012,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "営業時間"
@@ -23153,165 +23096,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "月-金 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "火-日 08:00-15:00; 土 08:00-12:00"
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -23328,5 +23271,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23336,5 +23279,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "駐車場の編集"
@@ -23345,25 +23288,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "参照番号"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "多階の建物"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "表面"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "パークアンドライド"
@@ -23372,48 +23315,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "料金"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "収容能力（全体）"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "障がい者用スペース"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "女性用スペース"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "保護者用スペース"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "他の収容能力はWiki を参照:[types]=*。"
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "洗車場の編集"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "自動車修理"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "自動車修理工場の編集"
@@ -23421,5 +23364,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "レンタル"
@@ -23428,10 +23371,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "レンタカーの編集"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "自家用車共有"
@@ -23439,5 +23382,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "カーシェアリング"
@@ -23445,10 +23388,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "駐輪場の編集"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "収容台数"
@@ -23457,10 +23400,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "自転車レンタルの編集"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23470,5 +23413,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23476,5 +23419,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -23482,5 +23425,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "停車場"
@@ -23488,5 +23431,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "停止線の編集"
@@ -23494,5 +23437,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "トラム停車場"
@@ -23501,5 +23444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "トラム停車場の編集"
@@ -23507,5 +23450,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "鉄道のプラットホーム"
@@ -23514,5 +23457,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "鉄道のプラットホームの編集"
@@ -23524,5 +23467,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "リファレンス (ホームの番号)"
@@ -23530,10 +23473,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "エリア"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "地下鉄の入口"
@@ -23542,10 +23485,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "地下鉄入口の編集"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "車いす"
@@ -23554,5 +23497,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "バスターミナル"
@@ -23561,5 +23504,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "バスターミナルの編集"
@@ -23567,5 +23510,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "バス停"
@@ -23575,5 +23518,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "バス停の編集"
@@ -23582,6 +23525,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "避難所"
@@ -23589,19 +23532,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "ベンチ"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "点字ブロック"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "バス乗り場"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "バス乗り場の編集"
@@ -23609,5 +23552,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "タクシー"
@@ -23615,5 +23558,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "タクシー乗り場の編集"
@@ -23621,10 +23564,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "空港"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23632,5 +23575,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23638,10 +23581,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23650,5 +23593,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23656,5 +23599,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23662,5 +23605,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23668,5 +23611,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23674,5 +23617,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23680,5 +23623,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23688,5 +23631,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23696,5 +23639,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23705,6 +23648,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "ビーコン"
@@ -23714,5 +23657,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23721,5 +23664,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23727,5 +23670,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23733,15 +23676,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "旅行"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "宿泊施設"
@@ -23753,5 +23696,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "ホテル"
@@ -23760,15 +23703,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "ホテルの編集"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "星の数"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "モーテル"
@@ -23776,20 +23719,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "モーテルの編集"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "ゲストハウス"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "ゲストハウスの編集"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "シャレー風の別荘、シャレー"
@@ -23797,10 +23740,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "シャレー風の別荘の編集"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "ホステル"
@@ -23808,30 +23751,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "ホステルの編集"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "山小屋"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "山小屋の編集"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "ハウストレーラー用駐車場"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "ハウストレーラー用駐車場の編集"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "キャンプ場"
@@ -23839,10 +23782,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "キャンプ場の編集"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "飲食店"
@@ -23853,5 +23796,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "レストラン"
@@ -23859,5 +23802,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "レストランの編集"
@@ -23865,5 +23808,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "料理の種類"
@@ -23871,73 +23814,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "イタリアン"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "中国料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "ピザ"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "バーガー"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "ギリシャ料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "ドイツ料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "インド料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "郷土料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "カバブ"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "トルコ料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "アジア各国料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "タイ料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "メキシコ料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "日本食"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "ファーストフード"
@@ -23945,17 +23888,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "ファーストフード店の編集"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "カフェ"
@@ -23963,9 +23906,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "カフェの編集"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "パブ、居酒屋"
@@ -23973,18 +23916,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "パブの編集"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "ビアガーデン"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "ビアガーデンの編集"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "バー"
@@ -23992,9 +23935,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "バーの編集"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "ナイトクラブ"
@@ -24002,24 +23945,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "ナイトクラブの編集"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "旅行"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "アトラクション"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "アトラクションの編集"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "博物館"
@@ -24027,9 +23970,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "博物館の編集"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "動物園"
@@ -24038,9 +23981,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "動物園の編集"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "観覧台"
@@ -24048,24 +23991,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "View pointの編集"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Look-Out Tower"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "テーマパーク"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "テーマパークの編集"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "美術館"
@@ -24073,5 +24016,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "美術館の編集"
@@ -24079,19 +24022,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "案内所"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "マップ"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "詳細なグレード"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "地形"
@@ -24129,5 +24072,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24135,28 +24078,28 @@
 msgstr "ストリート"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "スキーム"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "表示されたエリア"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "サイト"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "市区"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "地方"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "詳細な説明"
@@ -24166,5 +24109,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "表示されたルート:"
@@ -24172,5 +24115,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "ハイキング"
@@ -24178,6 +24121,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "サイクリング"
@@ -24185,5 +24128,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "マウンテンバイク"
@@ -24191,6 +24134,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "スキー"
@@ -24198,5 +24141,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "乗馬"
@@ -24204,46 +24147,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... 他の可能な輸送モード"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "情報板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "掲示板の内容"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "通知"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "履歴"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "野生生物"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "植物"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "道しるべ"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "情報端末"
@@ -24251,29 +24194,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "詳細な説明"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "音声ガイド"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "携帯電話経由の音声ガイド？"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "電話番号"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "その他の情報ポイント"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "シェルターの編集"
@@ -24281,25 +24224,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "野外炉"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "ピクニック場(野外調理場)"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "ピクニック場の編集"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "史跡"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "城"
@@ -24308,19 +24251,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "城の編集"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "遺跡(ruins)の編集"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "遺跡（群）"
@@ -24329,9 +24272,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "遺跡（群）の編集"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "戦場跡"
@@ -24339,10 +24282,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "戦場跡の編集"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "化石サイト"
@@ -24350,5 +24293,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "化石サイトの編集"
@@ -24356,15 +24299,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "記念塔(モニュメント)"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "モニュメントの編集"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "記念碑(戦争記念などの)"
@@ -24372,55 +24315,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "記念碑の編集"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "道路際の十字架"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "道路際の十字架の編集"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "道祖神"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "道祖神の編集"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "境界石"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "境界石を編集"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "レジャー"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "遊泳用プール"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "遊泳用プールの編集"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "遊び場"
@@ -24428,35 +24371,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "運動公園の編集"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "つり"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "つりの編集"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "スポーツ"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "スポーツ施設"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "スタジアム"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "スタジアムの編集"
@@ -24470,6 +24413,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "スポーツ選択："
@@ -24861,6 +24804,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24894,225 +24837,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "多目的"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "アーチェリー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "アスレチック"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "オーストラリアフットボール"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "野球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "バスケットボール"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "ペタンク"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "ボーリング"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "カヌー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "登山"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "クリケット"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "クリケットネット"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "クローク"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "サイクリング"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "ドッグレース"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "乗馬"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "フットボール"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "ゴルフ"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "体操"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "ホッケー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "競馬"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "モータースポーツ"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "ペロタ"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "ラケットボール"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ラグビー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "射撃"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "スケートボード"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "スケート"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "スキー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "サッカー"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "水泳"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "卓球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "テニス"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "スポーツセンター"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "スポーツセンターの編集"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "運動場"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "運動場の編集"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "競技トラック"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "競技場のトラックの編集"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "ゴルフコース"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "ゴルフコースの編集"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "ミニチュアゴルフ"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "ミニチュアゴルフの編集"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "スポーツ"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "多目的"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Multiの編集"
@@ -25151,21 +25094,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "タイプ"
@@ -25204,203 +25147,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "運動場"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "スポーツセンター"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "スタジアム"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "トラック"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "テンピンズ"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "テンピンズの編集"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "アスレチック"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "アスレチック場の編集"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "アーチェリー"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "アーチェリーの編集"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "登山"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "登山の編集"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "カヌー・競艇"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "競艇場の編集"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "サイクリングの編集"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "ドッグレース"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "ドックレースの編集"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "乗馬"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "乗馬の編集"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "競馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "競馬場の編集"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "体操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "体操競技の編集"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "モータースポーツ"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "モータースポーツの編集"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "スケート"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "スケート場の編集"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "スケートボード"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "スケートボードの編集"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "水泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "水泳の編集"
@@ -25408,52 +25351,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "スキーの編集"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "ゲレンデのタイプ"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "ダウンヒル"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "ノルディックスキー"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "スノーパーク"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "難易度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "初心者"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "初球"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "高度"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "エキスパート"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "ただ乗り"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "射撃"
@@ -25461,127 +25404,127 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "射撃の編集"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "球技"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "サッカー"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "サッカー場の編集"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "フットボール"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "フットボール場の編集"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "オーストラリアフットボール"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "オーストラリアフットボールの編集"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "野球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "野球場の編集"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "バスケットボール"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "バスケットボール場の編集"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "ゴルフ"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "ゴルフの編集"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "ゴルフコース"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "ペタンク"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "（ペタンクの）ブールの編集"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "ボーリング"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "ボーリング場の編集"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "クリケット"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "クリケットの編集"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "クリケットネット"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "クリケットネットの編集"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "クロッケー"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "クロッケーの編集"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "ホッケー"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "ホッケーの編集"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "ペロタ"
@@ -25589,50 +25532,50 @@
 #  ペロタ 《スペイン・南米・フィリピンなどで行なわれる球技; ハイアライ (jai alai) に発展》.
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "ペロタの編集"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "ラケットボール"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "ラケットボールの編集"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "ラグビー"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "ラグビー場の編集"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "卓球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "卓球の編集"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "テニス"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "テニスの編集"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "建造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "建物"
@@ -25640,5 +25583,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "公共の建物"
@@ -25646,10 +25589,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "公共の建物の編集"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "役場"
@@ -25657,10 +25600,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "役場の編集"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "大使館"
@@ -25668,10 +25611,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "大使館の編集"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "裁判所"
@@ -25680,10 +25623,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "裁判所の編集"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "刑務所"
@@ -25692,10 +25635,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "刑務所の編集"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "警察"
@@ -25705,10 +25648,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "警察署・交番の編集"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "消防署"
@@ -25717,10 +25660,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "消防署の編集"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "郵便局"
@@ -25728,5 +25671,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "郵便局の編集"
@@ -25734,15 +25677,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "幼稚園の編集"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "学校"
@@ -25750,10 +25693,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "学校の編集"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "大学"
@@ -25761,10 +25704,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "大学の編集"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "短大"
@@ -25772,5 +25715,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "短大の編集"
@@ -25778,5 +25721,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "映画館"
@@ -25785,10 +25728,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "映画館の編集"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "図書館"
@@ -25797,9 +25740,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "図書館の編集"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "美術館"
@@ -25807,10 +25750,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "美術館の編集"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "劇場"
@@ -25819,10 +25762,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "劇場の編集"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "礼拝所"
@@ -25832,5 +25775,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "礼拝所の編集"
@@ -25839,6 +25782,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "宗教"
@@ -25847,66 +25790,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "バハーイ教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "仏教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "キリスト教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "ヒンズー教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "ジャイナ教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "ユダヤ教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "ムスリム"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "シーク教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "降霊術士、イタコ"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "ユニテリアン"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "ゾロアスター教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "宗派"
@@ -25915,81 +25858,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "英国教会系"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "バプチスト"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "カトリック"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "福音派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "ものみの塔、エホバの証人"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "ルター派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "メソジスト派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "モルモン"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ギリシャ正教系"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "ペンテコステ派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "長老派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "プロテスタント"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "クエーカー教徒"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "シーア派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "スンニ派"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "住所"
@@ -25998,5 +25941,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "住所情報の編集"
@@ -26004,5 +25947,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "番地"
@@ -26010,25 +25953,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "家の名前"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "ストリートの名前"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "都市名"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "郵便番号"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "国コード"
@@ -26037,5 +25980,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "住所の補間を編集"
@@ -26043,61 +25986,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "番地付けルール"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "奇数"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "偶数"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "アルファベット順"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "人工物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "工場"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "工場の編集"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "タワー"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "タワーの編集"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "塔の種類"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "通信用"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "観察"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "高さ(メートル)"
@@ -26105,25 +26048,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "水道塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "水道塔の編集"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "ガスタンク"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "ガスタンクの編集"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "灯台"
@@ -26131,10 +26074,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "灯台の編集"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "風車"
@@ -26142,10 +26085,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "風車の編集"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "パイプライン"
@@ -26154,41 +26097,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "パイプラインの編集"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "ガス"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "熱"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "石油"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "下水"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "どれかの実体"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "ロケーション"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "水中"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "地上"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "下水処理場"
@@ -26198,10 +26141,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "下水処理場の編集"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "クレーン"
@@ -26209,5 +26152,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "クレーンの編集"
@@ -26215,10 +26158,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "誘導灯の編集"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "調査ポイント"
@@ -26226,10 +26169,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "測点の編集"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "監視カメラ"
@@ -26237,23 +26180,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "監視カメラの編集"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "インドア"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "アウトドア"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "公開"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "発電機"
@@ -26263,35 +26206,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "発電機の編集"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "風"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "水力発電"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "火力発電"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "原子力"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "石炭"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "太陽光発電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "変電所"
@@ -26300,10 +26243,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "変電所の編集"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "発電サブステーション"
@@ -26312,5 +26255,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "配電所の編集"
@@ -26318,10 +26261,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "ライン参照"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "送電塔"
@@ -26332,23 +26275,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "送電塔の編集"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "送電塔"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "電柱"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "塔の参照番号"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "送電線"
@@ -26357,74 +26300,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "送電線の編集"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "線の種類"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "線"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "細い線"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "電線の電流量"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "電力線束のうち良導体の線の数"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "シングル"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "ダブル"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "３"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "４"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "各種設備"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "トイレ"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "制限"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "備考"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "郵便ポスト"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "電話"
@@ -26433,5 +26376,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "電話を編集"
@@ -26439,5 +26382,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "コイン"
@@ -26445,5 +26388,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "備考"
@@ -26451,5 +26394,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "電子マネー"
@@ -26457,5 +26400,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "デビットカード"
@@ -26463,15 +26406,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "クレジットカード"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "テレフォンカード"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "リサイクル"
@@ -26480,5 +26423,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "リサイクルステーションの編集"
@@ -26486,35 +26429,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "バッテリー"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "カン"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "被服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "ガラス"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "紙"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "スクラップ金属"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "ゴミ箱"
@@ -26522,5 +26465,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "ゴミ箱を編集"
@@ -26529,31 +26472,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "背もたれ"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "素材"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "石"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "プラスチック"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "黒"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "茶"
@@ -26632,5 +26575,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26640,31 +26583,31 @@
 msgstr "緑"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "赤"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "青"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "グレー"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "白"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "席の数"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Hunting Stand"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Hunting Standの編集"
@@ -26673,30 +26616,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "高さ"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "低い"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "半分"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "完全"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "隠す"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "ロック"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "噴水"
@@ -26705,10 +26648,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "噴水の編集"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "飲料水"
@@ -26717,10 +26660,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "飲料水の編集"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "消火栓"
@@ -26729,5 +26672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "消火栓を編集"
@@ -26735,5 +26678,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "赤ちゃんポスト"
@@ -26741,15 +26684,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "赤ちゃんポストの編集"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "店舗"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "カーディーラ"
@@ -26757,10 +26700,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "自動車パーツショップの編集"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "自転車屋"
@@ -26769,28 +26712,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "自転車ショップの編集"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "スーパーマーケット"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "スーパーマーケットの編集"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "薬品屋"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "薬品屋の編集"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "コンビニエンスストア"
@@ -26798,9 +26741,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "コンビニの編集"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "キオスク"
@@ -26808,27 +26751,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "キオスクの編集"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "本屋"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "本屋を編集"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "旅行代理店"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "旅行代理店の編集"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "精肉店"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "精肉店の編集"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "パン屋"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "パン屋の編集"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "生花店"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "生花店の編集"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "オーガニック"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "オーガニック（有機）ショップの編集"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "酒屋"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "酒屋の編集"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "飲料店"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "酒屋(飲み物屋)の編集"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "コンピュータ店"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "コンピュータ店の編集"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "家電店"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "家電店の編集"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "オーディオショップ"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "オーディオショップの編集"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "家具店"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "家具店の編集"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "園芸用品店"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "園芸用品店の編集"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "金物屋"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "金物屋の編集"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "DIYショップ"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "DIYショップの編集"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "文具店"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "文具店の編集"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "美容院"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "美容院の編集"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "靴店"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "靴店の編集"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "おもちゃ屋"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "おもちゃ屋の編集"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "ビデオ"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "ビデオショップの編集"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "クリーニング店"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "クリーニング店の編集"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "ランドリー"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "ランドリーの編集"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "アウトドア店"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "アウトドア店の編集"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "スポーツ店"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "メガネ屋"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "眼鏡屋の編集"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "自動販売機"
@@ -26836,5 +26993,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "自動販売機の編集"
@@ -26842,306 +26999,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "自動販売機"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "公共_交通_チケット"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "公共輸送計画"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "パーキングチケット"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "食料"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "甘味"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "たばこ"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "写真"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "ペットフード"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "新聞"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "おもちゃ"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "切手"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "携帯の契約"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "プリペイド携帯のチャージ"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "車"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "自転車"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "コンドーム"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "タンポン"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "糞袋"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "決済または会員用カード"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "精肉店"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "精肉店の編集"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "パン屋"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "パン屋の編集"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "生花店"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "生花店の編集"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "オーガニック"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "オーガニック（有機）ショップの編集"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "酒屋"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "酒屋の編集"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "飲料店"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "酒屋(飲み物屋)の編集"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "コンピュータ店"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "コンピュータ店の編集"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "家電店"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "家電店の編集"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "オーディオショップ"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "オーディオショップの編集"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "家具店"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "家具店の編集"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "園芸用品店"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "園芸用品店の編集"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "金物屋"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "金物屋の編集"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "DIYショップ"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "DIYショップの編集"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "文具店"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "文具店の編集"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "美容院"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "美容院の編集"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "靴店"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "靴店の編集"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "おもちゃ屋"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "おもちゃ屋の編集"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "ビデオ"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "ビデオショップの編集"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "クリーニング店"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "クリーニング店の編集"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "ランドリー"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "ランドリーの編集"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "アウトドア店"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "アウトドア店の編集"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "スポーツ店"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "メガネ屋"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "眼鏡屋の編集"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "お金"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "銀行"
@@ -27149,14 +27098,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "銀行の編集"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "両替"
@@ -27164,5 +27113,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "両替の編集"
@@ -27170,15 +27119,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "ATMの編集"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "医院"
@@ -27186,18 +27135,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "医院の編集"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "歯科医院"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "歯科医院の編集"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "薬局"
@@ -27205,5 +27154,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "薬局の編集"
@@ -27211,9 +27160,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "調剤薬局"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "病院"
@@ -27221,10 +27170,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "病院の編集"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "夜間急病センター"
@@ -27233,5 +27182,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "夜間急病センターの編集"
@@ -27240,20 +27189,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "ポイント数"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "ポイント名"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "電話番号"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(+81-3-3345-6789のような国際で通用する電話番号を使ってください)"
@@ -27261,5 +27210,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "動物病院"
@@ -27268,64 +27217,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "動物病院の編集"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "地理学"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "大陸"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "大陸の編集"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "国(country)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "国(country)の編集"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "州(state)"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "州(state)の編集"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "地方"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "地方の編集"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "郡"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "郡の編集"
@@ -27333,15 +27282,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "市区"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "市区の編集"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "町"
@@ -27349,10 +27298,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "町の編集"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "近郊住宅地"
@@ -27360,25 +27309,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "近郊住宅地の編集"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "村"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "村の編集"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "小村落"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "小村落の編集"
@@ -27386,5 +27335,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "地域"
@@ -27392,10 +27341,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "地域の編集"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "島"
@@ -27403,10 +27352,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "島の編集"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "小島"
@@ -27414,5 +27363,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "小島を編集"
@@ -27420,5 +27369,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "洞窟の入口"
@@ -27426,10 +27375,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "洞窟の入口の編集"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "山頂"
@@ -27437,10 +27386,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "山頂の編集"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "氷河"
@@ -27448,10 +27397,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "氷河の編集"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "火山"
@@ -27459,70 +27408,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "火山の編集"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "境界線"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "国境"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "国境の編集"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "行政区画"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "行政区画の編集"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil境界"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Civil境界の編集"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "地点名"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Political境界の編集"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "国立公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "国立公園の境界編集"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "樹木・林"
@@ -27531,15 +27480,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "樹木・林の編集"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "植物の名前"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "森"
@@ -27548,5 +27497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "森の編集"
@@ -27554,17 +27503,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "針葉樹"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "広葉樹"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "混合林"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "森林"
@@ -27573,14 +27522,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "森の編集"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "自然保護区"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "自然保護区の編集"
@@ -27588,25 +27537,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "ガレ場"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "ガレ場の編集"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "低木林"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "低木林の編集"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "山(Fell)"
@@ -27614,10 +27563,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "山(Fell)の編集"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "荒れ地"
@@ -27625,5 +27574,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "荒れ地の編集"
@@ -27631,5 +27580,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "農家の庭"
@@ -27638,45 +27587,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "農家の庭の編集"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "農地"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "農地の編集"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "牧草地"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "牧草地の編集"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "ぶどう園"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "ぶどう園の土地利用の編集"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "貸し農園"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "家庭菜園用地の編集"
@@ -27684,25 +27633,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "庭園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "庭園の編集"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "草地の編集"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "里山"
@@ -27710,10 +27659,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "里山利用区画の編集"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "共有地"
@@ -27721,20 +27670,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "共有地の名前"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "公園の編集"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "レクレーション広場"
@@ -27742,5 +27691,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "レクレーション広場利用区画の編集"
@@ -27748,15 +27697,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "住宅エリア"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "住宅用地の編集"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "墓所"
@@ -27764,9 +27713,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "（教会・寺院にある）墓所の編集"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "共同墓地"
@@ -27774,39 +27723,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "共同墓地の編集"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "小売り商業"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "小売商用地の編集"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "商用"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "商用地の編集"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "工業"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "工業地の編集"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "鉄道用地"
@@ -27814,15 +27763,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "鉄道用地の編集"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "軍用"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "軍用地の編集"
@@ -27830,50 +27779,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "工事中エリア"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "工事中用地の編集"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "利用されなくなった商業設備"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "利用されなくなった工業地の編集"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "未開発工業地"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "緑地の編集"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "埋め立てゴミ処理地"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "埋め立てゴミ処理地の編集"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "採石場"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "採石場の編集"
@@ -27883,5 +27832,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "マルチポリゴンを編集"
@@ -27890,10 +27839,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "外側のセグメント"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "内側のセグメント"
@@ -27901,5 +27850,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "右左折制限"
@@ -27908,5 +27857,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "右左折制限の編集"
@@ -27914,34 +27863,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "通行制限"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "左折禁止"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "右折禁止"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "直進禁止"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "Uターン禁止"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "右折のみ"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "左折のみ"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "直進のみ"
@@ -27950,15 +27899,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "ウェイから"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "ノードかウェイを経由して"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "ウェイへ"
@@ -27966,5 +27915,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "ルート"
@@ -27973,5 +27922,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "ルート編集"
@@ -27979,5 +27928,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "ルート種類"
@@ -28068,5 +28017,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28076,17 +28025,17 @@
 msgstr "自転車"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "バス"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "道"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "フェリー"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "スキー"
@@ -28146,5 +28095,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28153,9 +28102,9 @@
 msgstr "徒歩"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "トラム"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "迂回路"
@@ -28169,10 +28118,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "地下鉄"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "シンボルの説明"
@@ -28180,31 +28129,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "ネットワーク"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "ルート状態"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "案"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "代替路"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "一時的"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "接続"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "色 (16進法)"
@@ -28213,32 +28162,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "ルートセグメント"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "前のセグメント"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "後方セグメント"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "停止点"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "前方の停止点"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "後方の停止点"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "標準"
 
 #. mappaint style named "standard"
@@ -32261,4 +32285,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
+
+#~ msgid "Bikes"
+#~ msgstr "自転車"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/nb.po
===================================================================
--- /applications/editors/josm/i18n/po/nb.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/nb.po	(revision 20945)
@@ -8,5 +8,5 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
 "PO-Revision-Date: 2010-02-26 22:59+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:44+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:52+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1192,5 +1192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Kan ikke flytte objekter utenfor kartet."
@@ -1503,5 +1503,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2257,9 +2257,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2342,26 +2342,26 @@
 msgstr "Avslutt tegning."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Trekk ut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Tegn områder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Trekk ut linje"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Trekk ut et fritt valgt rektangel og slipp museknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2381,6 +2381,6 @@
 "+slipp synkroniserer audio i dette punktet."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2392,9 +2392,9 @@
 msgstr "Velg"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Velg, flytt og roter objekt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2403,17 +2403,17 @@
 msgstr[1] "Legg til og flytt en kunstig node til {0} linjer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Flytt elementer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Flytt dem"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Angre flytting"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2423,9 +2423,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Slipp museknappen for å velge objektene i rektangelet."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2434,9 +2434,9 @@
 "nærmeste node."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Slipp museknappen for å avslutte rotasjon."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3173,5 +3173,5 @@
 msgstr "Gjennomføre?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3743,17 +3743,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "forbindelse"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Bilder uten egenskaper"
+msgstr ""
 
 #. teal
@@ -3934,5 +3931,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "jernbane"
@@ -5246,5 +5243,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alle"
@@ -5659,4 +5656,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5747,5 +5749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relasjoner"
@@ -5847,14 +5849,14 @@
 msgstr "Utvalg: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Frigjør panelet"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Lukk panelet. Du kan åpne det med knappene i venstre verktøygruppe."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klikk for at minimere/maksimere panelet"
@@ -6184,4 +6186,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6194,10 +6202,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6867,145 +6869,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Navn"
@@ -8221,10 +8223,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Type"
@@ -8232,5 +8234,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8244,17 +8245,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "ukjent"
@@ -9034,11 +9034,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9055,14 +9057,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Lag"
@@ -9595,5 +9597,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Beskrivelse"
@@ -10668,55 +10670,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11203,5 +11205,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Bil"
@@ -11223,16 +11225,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Sykkel"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11262,12 +11265,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Til fots"
@@ -11973,12 +11976,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Gatenavn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Måleverdier"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14244,6 +14245,7 @@
 msgstr "Last opp sporlogger"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14334,5 +14336,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpoler adresser"
@@ -14519,5 +14521,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14558,19 +14560,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Bygninger"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14578,5 +14580,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14589,10 +14591,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14634,7 +14636,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert Zone 2 cache file (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14780,5 +14781,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16639,5 +16640,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Offentlig transport"
@@ -16689,5 +16690,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Veipunkt"
@@ -17265,4 +17266,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Type"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17419,4 +17437,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Svingeforbud"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Svingeforbud"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18175,5 +18207,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19484,7 +19516,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Veinummer"
@@ -19501,5 +19533,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Kjørebaner"
@@ -19517,4 +19549,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19522,9 +19555,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Hastighetsbegrensning (km/t)"
@@ -19552,15 +19584,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19571,11 +19597,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Enveiskjøring"
@@ -19595,15 +19620,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19620,11 +19643,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19645,8 +19668,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19664,11 +19687,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19688,6 +19711,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19705,11 +19728,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Skjæring"
@@ -19729,6 +19752,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19746,11 +19769,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Øy"
@@ -19888,5 +19911,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19895,12 +19918,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19908,13 +19934,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Bredde ( meter)"
@@ -19943,24 +19969,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Veidekke"
@@ -19972,5 +19994,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19984,11 +20006,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "fast dekke"
@@ -19996,10 +20017,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "uten fast dekke"
@@ -20007,10 +20028,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -20018,11 +20039,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "betong"
@@ -20030,10 +20050,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -20041,10 +20061,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "skogsområde"
@@ -20052,10 +20072,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -20063,11 +20083,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "brostein"
@@ -20075,10 +20094,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "grus"
@@ -20086,10 +20105,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -20097,10 +20116,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -20108,10 +20127,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20119,10 +20138,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "gress"
@@ -20130,10 +20149,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sand"
@@ -20141,10 +20160,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "jord"
@@ -20225,6 +20244,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Vei (ukjent type)"
@@ -20233,5 +20251,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Rediger vei av ukjent type"
@@ -20239,6 +20257,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Veiarbeid"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Rediger vei under bygging"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Kryss"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rundkjøring"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Restriksjoner"
@@ -20247,15 +20294,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Rediger restriksjioner"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Avgift"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Ingen gjennomkjøring"
@@ -20263,5 +20310,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Adkomst"
@@ -20303,28 +20350,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ja"
@@ -20337,10 +20383,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20354,10 +20400,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20381,97 +20427,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "Skog- og Landbruk"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nei"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "brukertype"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Varer"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung last (hgv)"
@@ -20486,10 +20532,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Hest"
@@ -20505,10 +20551,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorsykkel"
@@ -20523,19 +20569,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorkjøretøy"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Offentlige Tjenestekjøretøy (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. hastighet (km/t)"
@@ -20543,20 +20589,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "maks totalvekt"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. Høyde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. Bredde (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. Lengde (meter)"
@@ -20564,5 +20610,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rundkjøring"
@@ -20573,5 +20619,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Rediger kryss"
@@ -20591,10 +20637,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorway"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "motorway_link"
@@ -20616,10 +20662,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "trunk"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "trunk_link"
@@ -20641,10 +20687,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "riksvei"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "tilkjørselsvei_riksvei"
@@ -20666,5 +20712,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20679,9 +20725,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "kommunevei"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "småvei"
@@ -20695,9 +20741,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "boligvei"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "gatetun"
@@ -20727,10 +20773,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "adkomstvei"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "trikkespor"
@@ -20760,5 +20806,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20770,10 +20816,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Rediger bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Rediger tunnel"
@@ -20781,39 +20827,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Måter"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Veiarbeid"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Rediger vei under bygging"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Kryss"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rundkjøring"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Traktorvei"
@@ -20822,73 +20839,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Rediger traktorvei"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "tur"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Sti"
@@ -20897,38 +20882,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Rediger sti"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "tur"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "middels"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snøscooter"
@@ -20937,5 +20952,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20943,5 +20958,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Rediger ridevei"
@@ -20949,5 +20964,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20965,11 +20980,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Rediger sykkelvei"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20977,5 +20992,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20983,5 +20998,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20989,5 +21004,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20996,15 +21011,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Rediger gangvei"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Trapper"
@@ -21014,10 +21025,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Rediger trapper"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Motorveikryss"
@@ -21025,15 +21036,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Rediger motorveikryss"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Service"
@@ -21041,5 +21052,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Rediger Serviceområde"
@@ -21079,17 +21090,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operatør"
@@ -21098,5 +21109,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Trafikklys"
@@ -21106,5 +21117,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Type gangfelt"
@@ -21113,27 +21124,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "ukontrollert"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "trafikklys"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "trafikkøy"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "umerket"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Kryssende ridevei"
@@ -21141,6 +21152,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Kryssende sykkelvei"
@@ -21149,11 +21160,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Betjent fotgjengerfelt"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Crossing type name (UK)"
@@ -21161,30 +21172,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Full stopp"
@@ -21192,5 +21203,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Fotgjengerfelt"
@@ -21199,14 +21210,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Rediger fotgjengerfelt"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Type name (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21214,33 +21225,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21248,5 +21259,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21254,5 +21265,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-rundkjøring"
@@ -21263,14 +21274,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Retning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "med_klokka"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Vendesirkel"
@@ -21280,5 +21291,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Bygrense"
@@ -21286,15 +21297,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Rediger bygrenseskilt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Annet navn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Fotoboks"
@@ -21303,5 +21314,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Nødtelefon"
@@ -21309,5 +21320,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Stigning"
@@ -21315,5 +21326,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Sterk stigning"
@@ -21321,5 +21332,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21329,10 +21340,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Vadested"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Rediger vadested"
@@ -21340,5 +21351,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Fjellpass"
@@ -21346,5 +21357,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Rediger fjellpass"
@@ -21356,7 +21367,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Høyde"
@@ -21364,5 +21375,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Stengsel"
@@ -21370,5 +21381,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Sperresøyle"
@@ -21376,5 +21387,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Rediger sperresøyle"
@@ -21419,16 +21430,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Tillatt trafikk:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Halvbommer"
@@ -21437,5 +21448,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Steinblokk"
@@ -21443,5 +21454,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Ferist"
@@ -21449,10 +21460,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Rediger ferist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bussluse"
@@ -21460,15 +21471,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Pigghinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Rediger pigghinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Bomstasjon"
@@ -21476,5 +21487,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Rediger bomstasjon"
@@ -21482,10 +21493,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Tollstasjon"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Rediger tollstasjon"
@@ -21495,5 +21506,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Hekk"
@@ -21504,22 +21515,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Gjerde"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Mur"
@@ -21527,5 +21538,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Bymur"
@@ -21534,5 +21545,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Støttemur"
@@ -21544,10 +21555,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Inngang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Rediger inngang"
@@ -21555,5 +21566,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Port"
@@ -21561,50 +21572,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Rediger port"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Veibom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Rediger veibom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Rediger gjerdestengsel"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Støtfangergjerde"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Rediger støtfangergjerde"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Fotgjengerport"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Rediger fotgjengerport"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Gjerdetrapp"
@@ -21612,25 +21623,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Rediger gjerdetrapp"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Sortiport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Rediger sortiport"
@@ -21641,11 +21652,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vann"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Vannkilde"
@@ -21653,5 +21664,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Rediger vannkilde"
@@ -21659,5 +21670,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Drenering"
@@ -21665,10 +21676,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Rediger drenering"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21676,10 +21687,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Bekk"
@@ -21687,10 +21698,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Rediger bekk"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -21698,10 +21709,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Rediger kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Elv"
@@ -21711,5 +21722,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Rediger elv"
@@ -21717,15 +21728,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Rediger vann"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Rediger land"
@@ -21733,15 +21744,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Basseng"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Rediger basseng"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Drikkevannskilde"
@@ -21749,15 +21760,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Rediger drikkevannskilde"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Tildekt drikkevannskilde"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Rediger tildekt drikkevannskilde"
@@ -21765,5 +21776,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Elvebredd"
@@ -21772,10 +21783,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Rediger elvebredd"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Våtmarksområde"
@@ -21786,14 +21797,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Rediger våtmarksområde"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Sumpområde"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "Flytemyr"
@@ -21807,35 +21818,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "Myrområde"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "Sivområde"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "Saltmyr"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "Tidevannsflate"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "Mangrove"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Gjørme"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Rediger gjørme"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strand"
@@ -21843,20 +21854,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Rediger strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Havbukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Rediger havbukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Klippe"
@@ -21864,10 +21875,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Rediger klippe"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Kystlinje"
@@ -21875,5 +21886,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Rediger kystlinje"
@@ -21881,5 +21892,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Fergerute"
@@ -21887,5 +21898,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Rediger fergerute"
@@ -21894,5 +21905,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Skipsverft"
@@ -21900,10 +21911,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Rediger skipsverft"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Tørrdokk"
@@ -21911,5 +21922,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Rediger tørrdokk"
@@ -21917,5 +21928,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Demning"
@@ -21923,15 +21934,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Rediger demning"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Punkt i vann"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Sluseport"
@@ -21940,5 +21951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Terskeldam"
@@ -21946,20 +21957,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Rediger terskeldam"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Foss"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Rediger foss"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Snuplass"
@@ -21968,15 +21979,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Rediger marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Brygge"
@@ -21984,10 +21995,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Rediger brygge"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Fergeleie"
@@ -21995,10 +22006,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Rediger fergeleie"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Båtslipp"
@@ -22008,20 +22019,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Rediger båtslipp"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Jernbane"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Jernbane"
@@ -22029,5 +22040,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Rediger jernbane"
@@ -22057,86 +22068,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22148,8 +22084,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22163,29 +22099,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "Stasjonsområde"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "Sidespor"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "Privat sidespor"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22198,8 +22134,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22270,8 +22206,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22283,8 +22219,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Spenning"
@@ -22297,8 +22233,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22311,23 +22247,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Smal jernbane"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Rediger smal jernbane"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22335,50 +22271,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Rediger Monorail"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Fredet bane"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Rediger fredet bane"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Bybane"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Rediger bybane"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "T-bane"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Rediger T-bane"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Trikk"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Rediger trikk"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Busspor"
@@ -22386,5 +22322,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Rediger busspor"
@@ -22393,10 +22329,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Nedlagt jernbane"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Rediger nedlagt jernbane"
@@ -22405,9 +22341,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Alternative typer"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Revet jernbane"
@@ -22416,5 +22352,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Planovergang"
@@ -22423,5 +22359,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Fotgjengerfelt"
@@ -22431,5 +22367,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Type fotgjengerfelt"
@@ -22437,5 +22373,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Dreieskive"
@@ -22444,5 +22380,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22451,10 +22387,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Taubaner og -heiser"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Stolheis"
@@ -22462,10 +22398,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Rediger stolheis"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "T-krokheis"
@@ -22473,10 +22409,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Rediger T-krokheis"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Taubane"
@@ -22484,10 +22420,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Rediger taubane"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondolbane"
@@ -22495,10 +22431,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Rediger gondolbane"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22507,5 +22443,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22513,5 +22449,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22520,5 +22456,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22526,5 +22462,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Bensinstasjon"
@@ -22534,62 +22470,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Rediger bensinstasjon"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22647,32 +22583,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Åpningstider"
@@ -22731,165 +22667,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22906,5 +22842,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22914,5 +22850,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Rediger parkering"
@@ -22923,25 +22859,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referansenummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "P-hus"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "Overflateparkering"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "P-kjeller"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22950,48 +22886,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Gebyr"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Handicap-plasser"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Bilvask"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Rediger bilvask"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Verksted"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Rediger verksted"
@@ -22999,5 +22935,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Bilutleie"
@@ -23006,10 +22942,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Rediger bilutleie"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Bildeling"
@@ -23017,5 +22953,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Rediger bildeling"
@@ -23023,10 +22959,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Rediger sykkelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapasitet"
@@ -23035,10 +22971,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Rediger sykkelutleie"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23048,5 +22984,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23054,5 +22990,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "Internasjonal UIC-jernbanekode"
@@ -23060,5 +22996,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Jernbanestopp"
@@ -23066,5 +23002,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Rediger jernbanestopp"
@@ -23072,5 +23008,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Trikkestopp"
@@ -23079,5 +23015,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Rediger trikkestopp"
@@ -23085,5 +23021,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Jernbaneplattform"
@@ -23092,5 +23028,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Rediger jernbaneplattform"
@@ -23102,5 +23038,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Spornummer"
@@ -23108,10 +23044,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "T-baneinngang"
@@ -23120,10 +23056,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Rediger T-baneinngang"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Rullestol"
@@ -23132,5 +23068,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Busstasjon"
@@ -23139,5 +23075,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Rediger busstasjon"
@@ -23145,5 +23081,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Bussholdeplass"
@@ -23153,5 +23089,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Rediger bussholdeplass"
@@ -23160,6 +23096,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Leskur / Ly for natten"
@@ -23167,19 +23103,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Benk"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Bussplatform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Rediger bussplattform"
@@ -23187,5 +23123,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23193,5 +23129,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Rediger taxi-stasjon"
@@ -23199,10 +23135,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Flyplass"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23210,5 +23146,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23216,10 +23152,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23228,5 +23164,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23234,5 +23170,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23240,5 +23176,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23246,5 +23182,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23252,5 +23188,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23258,5 +23194,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23266,5 +23202,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23274,5 +23210,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23283,6 +23219,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fyrlykt"
@@ -23292,5 +23228,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23299,5 +23235,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23305,5 +23241,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23311,15 +23247,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Overnatting"
@@ -23331,5 +23267,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -23338,15 +23274,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Rediger hotell"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stjerner"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motell"
@@ -23354,20 +23290,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Rediger motell"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Gjestehus"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Rediger gjestehus"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Feriehytter"
@@ -23375,10 +23311,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Rediger feriehytter"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Ungdomsherberge"
@@ -23386,30 +23322,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Rediger ungdomsherberge"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Rediger fjellstue"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Rediger campingvognplass"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Campingplass"
@@ -23417,10 +23353,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Rediger campingplass"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Mat og drikke"
@@ -23431,5 +23367,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -23437,5 +23373,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Rediger restaurant"
@@ -23443,5 +23379,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Kjøkken"
@@ -23449,73 +23385,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italiensk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "kinesisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "gatekjøkken"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "gresk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "tysk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "lokal"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "tyrkisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatisk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "meksikansk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japansk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Gatekjøkken"
@@ -23523,17 +23459,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Rediger gatekjøkken"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kafé"
@@ -23541,9 +23477,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Rediger kafé"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -23551,18 +23487,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Rediger pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Rediger Biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -23570,9 +23506,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Rediger bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -23580,24 +23516,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Rediger nattklubb"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attraksjon"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Rediger attraksjon"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -23605,9 +23541,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Rediger museum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoologisk hage"
@@ -23616,9 +23552,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Rediger  zoologisk hage"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Utsiktspunkt"
@@ -23626,24 +23562,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Rediger utsiktspunkt"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Utsiktstårn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Temapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Rediger temapark"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Kunstverk"
@@ -23651,5 +23587,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Rediger kunstverk"
@@ -23657,19 +23593,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Turistinformasjon"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Kart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23707,5 +23643,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23713,28 +23649,28 @@
 msgstr "gate"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Nærmere forklaring"
@@ -23744,5 +23680,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23750,5 +23686,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Tursti"
@@ -23756,6 +23692,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Sykling"
@@ -23763,5 +23699,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23769,6 +23705,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Ski"
@@ -23776,5 +23712,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23782,46 +23718,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Informasjonstavle"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "historisk"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "natur"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "dyreliv"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23829,29 +23765,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Annen informasjon"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Rediger ly for natten"
@@ -23859,25 +23795,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Bålplass"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Piknik-sted"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Rediger piknik-sted"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historiske steder"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Slott"
@@ -23886,19 +23822,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Rediger slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Rediger ruiner"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Arkeologisk plass"
@@ -23907,9 +23843,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Rediger arkeologisk plass"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Slagmark"
@@ -23917,10 +23853,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Rediger slagmark"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23928,5 +23864,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23934,15 +23870,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Rediger monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minneplatte"
@@ -23950,55 +23886,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Rediger minneplatte"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kors i veikant"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Rediger kors i veikant"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Veialter"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Rediger veialter"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Fritid"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badepark"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Rediger badepark"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Lekeplass"
@@ -24006,35 +23942,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Rediger lekeplass"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiskeplass"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Rediger fiskeplass"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Sport"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sport"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Rediger stadion"
@@ -24048,6 +23984,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "velg sport:"
@@ -24439,6 +24375,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24472,225 +24408,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "flerbruk"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bueskyting"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "turn"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australsk fotball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "bowls"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klatring"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricketnett"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "sykling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundeløp"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastikk"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "hesteløp"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skyting"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skøyter"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "ski"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "svømming"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportssenter"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Rediger sportssenter"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Bane"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Rediger bane"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Racerbane"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Rediger racerbane"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbane"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Rediger golfbane"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Rediger minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Flerbruk"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Rediger flerbruk"
@@ -24729,21 +24665,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "type"
@@ -24782,203 +24718,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "bane"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sportssenter"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "bowling"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Rediger bowling"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Turn"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Rediger turn"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bueskyting"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Rediger bueskyting"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klatring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Rediger klatring"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Rediger kano"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Rediger sykling"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundeløp"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Rediger hundeløp"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridning"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Rediger ridning"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Hesteløp"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Rediger hesteløp"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastikk"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Rediger gymnastikk"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Rediger motorsport"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skøyter"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Rediger skøyter"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Rediger skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Svømming"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Rediger svømming"
@@ -24986,52 +24922,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Rediger ski"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Løypetype"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "slalom"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "langrenn"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "snøpark"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Vanskelighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "begynner"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "enkel"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "vanskelig"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "ekspert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "fristil"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skyting"
@@ -25039,177 +24975,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Rediger skyting"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Ballsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotball"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Rediger fotball"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fotball"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Rediger amerikansk fotball"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australsk fotball"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Rediger australsk fotball"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Rediger baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Rediger basketball"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Rediger golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfbane"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Rediger boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowls"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Rediger bowls"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Rediger cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnett"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Rediger cricketnett"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Rediger krocket"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Rediger ishockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Rediger pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquet"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Rediger racquet"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rediger rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Rediger bordtennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Rediger tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bygning"
@@ -25217,5 +25153,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig bygning"
@@ -25223,10 +25159,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Rediger offentlig bygning"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Rådhus"
@@ -25234,10 +25170,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Rediger rådhus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -25245,10 +25181,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Rediger ambassade"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domstol"
@@ -25257,10 +25193,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Rediger domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fengsel"
@@ -25269,10 +25205,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Rediger fengsel"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politi"
@@ -25282,10 +25218,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Rediger politi"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brannstasjon"
@@ -25294,10 +25230,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Rediger brannstasjon"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -25305,5 +25241,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Rediger postkontor"
@@ -25311,15 +25247,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Rediger barnehage"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skole"
@@ -25327,10 +25263,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Rediger skole"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universitet"
@@ -25338,10 +25274,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Rediger universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Høyskole"
@@ -25349,5 +25285,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Rediger høyskole"
@@ -25355,5 +25291,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -25362,10 +25298,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Rediger kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -25374,9 +25310,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Rediger bibliotek"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstsenter"
@@ -25384,10 +25320,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Rediger kunstsenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -25396,10 +25332,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Rediger teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Tilbedelsessted"
@@ -25409,5 +25345,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Rediger tilbedelsessted"
@@ -25416,6 +25352,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -25424,66 +25360,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddhist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "kristen"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "jødisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muslim"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarisk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Trosretniing"
@@ -25492,81 +25428,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikansk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katolsk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelisk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Jehovas vitner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luthersk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoks"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pinsebevegelsen"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyteriansk"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -25575,5 +25511,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Rediger adresseinformasjon"
@@ -25581,5 +25517,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -25587,25 +25523,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnavn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Gatenavn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "By/sted"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskode"
@@ -25614,5 +25550,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Rediger interpolasjon"
@@ -25620,61 +25556,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummereringsmåte"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "oddetall"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "partall"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabetisk"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Menneskeskapt"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrikk"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Rediger fabrikk"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Tårn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Rediger tårn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25682,25 +25618,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vanntårn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Rediger vanntårn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gassbeholder"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Rediger gassbeholder"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtårn"
@@ -25708,10 +25644,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Rediger fyrtårn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Vindmølle"
@@ -25719,10 +25655,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Rediger vindmølle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rørledning"
@@ -25731,41 +25667,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Rediger rørledning"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gass"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Område"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kloakkrenseanlegg"
@@ -25775,10 +25711,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Rediger kloakkrenseanlegg"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -25786,5 +25722,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Rediger kran"
@@ -25792,10 +25728,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Rediger fyrlykt"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Trigonometrisk punkt"
@@ -25803,10 +25739,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Rediger trigonometrisk punkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Overvåkingskamera"
@@ -25814,23 +25750,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Rediger overvåkingskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -25840,35 +25776,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Rediger kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "vind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vann"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "atom"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kull"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "solcelle"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Kraftstasjon"
@@ -25877,10 +25813,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Rediger kraftstasjon"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Transformatorstasjon"
@@ -25889,5 +25825,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Rediger transformatorstasjon"
@@ -25895,10 +25831,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Linjenummer"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Kraftmast"
@@ -25909,23 +25845,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Rediger kraftmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Kraftlinje"
@@ -25934,74 +25870,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Rediger kraftlinje"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Fasiliteter"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Kommentar"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Postkasse"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -26010,5 +25946,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Rediger telefon"
@@ -26016,5 +25952,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mynter"
@@ -26022,5 +25958,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Sedler"
@@ -26028,5 +25964,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronisk lommebok eller betalingskort"
@@ -26034,5 +25970,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Bankkort"
@@ -26040,15 +25976,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kredittkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Returstasjon"
@@ -26057,5 +25993,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Rediger returstasjon"
@@ -26063,35 +25999,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Bokser"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Klær"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glass"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papir"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Metall"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26099,5 +26035,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26106,31 +26042,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26209,5 +26145,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26217,31 +26153,31 @@
 msgstr "grønn"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Jaktpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Rediger jaktpost"
@@ -26250,30 +26186,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Høyde"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "lav"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Skjul"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontene"
@@ -26282,10 +26218,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Rediger fontene"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Drikkevann"
@@ -26294,10 +26230,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Rediger drikkevann"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26306,5 +26242,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26312,5 +26248,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Stellebord"
@@ -26318,15 +26254,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Rediger stellebord"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Butikker"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26334,10 +26270,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Rediger bilforretning"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26346,28 +26282,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Rediger sykkelbutikk"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarked"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Rediger supermarked"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Minimarked"
@@ -26375,9 +26311,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Rediger Minimarked"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26385,27 +26321,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Rediger kiosk"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Slakter"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Rediger slakter"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Baker"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Rediger baker"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Blomster"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Rediger blomster"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Økologisk"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Rediger økologisk"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Sprit og vin"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Rediger sprit og vin"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Drikke"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Rediger drikke"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Dataelektronikk"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Rediger dataelektronikk"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronikk"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Rediger elektronikk"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Rediger hifi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Møbler"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Rediger møbler"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Hagesenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Rediger hagesenter"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Jernvarehandel"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Rediger jernvarehandel"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Byggevare"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Rediger byggevare"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Kontor"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Rediger kontor"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Frisør"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Rediger frisør"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Sko"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Rediger sko"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Leker"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Rediger leker"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Video"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Rediger video"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Renseri"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Rediger renseri"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Vaskeri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Rediger vaskeri"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Friluftsutstyr"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Rediger friluftsutstyr"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Rediger sport"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Rediger optiker"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Automat"
@@ -26413,5 +26563,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Rediger automat"
@@ -26419,306 +26569,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Automatprodukter"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "billetter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "buss-, trikk- og togkart"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkeringsbillett"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "drikke"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "godter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "sigaretter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "foto"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "dyremat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "aviser"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "leker"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "frimerke"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "sedler"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "sykkel"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "hundeposer"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "kundekort"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Slakter"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Rediger slakter"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Baker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Rediger baker"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Blomster"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Rediger blomster"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Økologisk"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Rediger økologisk"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Sprit og vin"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Rediger sprit og vin"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Drikke"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Rediger drikke"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Dataelektronikk"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Rediger dataelektronikk"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronikk"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Rediger elektronikk"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Rediger hifi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Møbler"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Rediger møbler"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Hagesenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Rediger hagesenter"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Jernvarehandel"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Rediger jernvarehandel"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Byggevare"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Rediger byggevare"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Kontor"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Rediger kontor"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Frisør"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Rediger frisør"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Sko"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Rediger sko"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Leker"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Rediger leker"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Video"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Rediger video"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Renseri"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Rediger renseri"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Vaskeri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Rediger vaskeri"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Friluftsutstyr"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Rediger friluftsutstyr"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Rediger sport"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Rediger optiker"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Valuta"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -26726,14 +26668,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Rediger bank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Minibank"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Veksle valuta"
@@ -26741,5 +26683,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Rediger valutaveksling"
@@ -26747,15 +26689,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Rediger minibank"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Helse"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Lege"
@@ -26763,18 +26705,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Rediger lege"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Tannlege"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Rediger tannlege"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -26782,5 +26724,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Rediger apotek"
@@ -26788,9 +26730,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Reseptlevering"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Sykehus"
@@ -26798,10 +26740,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Rediger sykehus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Redningsmøtepunkt"
@@ -26810,5 +26752,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Rediger redningsmøtepunkt"
@@ -26817,20 +26759,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Punktnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Navn på punkt"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Bruk internasjonalt nummer, f.eks. +12-345-67890)"
@@ -26838,5 +26780,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinær"
@@ -26845,64 +26787,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Rediger veterinær"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Steder"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Rediger kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Rediger land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Delstat/provins"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Rediger delstat/provins"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Rediger region (fylke)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Kommune"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Rediger kommune"
@@ -26910,15 +26852,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Storby"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Rediger storby"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "By"
@@ -26926,10 +26868,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Rediger by"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Forstad/bydel"
@@ -26937,25 +26879,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Rediger forstad/bydel"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Landsby"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Rediger landsby"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Grend"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Rediger grend"
@@ -26963,5 +26905,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Lokalitet"
@@ -26969,10 +26911,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Rediger lokalitet"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Øy"
@@ -26980,10 +26922,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Rediger øy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26991,5 +26933,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26997,5 +26939,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Huleinngang"
@@ -27003,10 +26945,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Rediger huleinngang"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Fjelltopp"
@@ -27014,10 +26956,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Rediger fjelltopp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Isbre"
@@ -27025,10 +26967,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Rediger isbre"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkan"
@@ -27036,70 +26978,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Rediger vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Grenser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nasjonal"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Rediger landegrense"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Fylkesgrense"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Rediger fylkesgrense"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Kommunegrense"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Rediger kommunegrense"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Rediger politisk grense"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Nasjonalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Rediger nasjonalparkgrense"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Bruk av grunn"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Tre"
@@ -27108,15 +27050,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Rediger tre"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanisk navn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Skogsområde"
@@ -27125,5 +27067,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Rediger skogsområde"
@@ -27131,17 +27073,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "barskog"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "løvskog"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "blandingsskog"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Skog"
@@ -27150,14 +27092,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Rediger skog"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Rediger naturreservat"
@@ -27165,25 +27107,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Steinur"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Rediger steinur"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Krattskog"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Rediger krattskog"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Fjell"
@@ -27191,10 +27133,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Rediger fjell"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Beite"
@@ -27202,5 +27144,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Rediger beite"
@@ -27208,5 +27150,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Gårdstun"
@@ -27215,45 +27157,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Rediger gårdstun"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Åkerland"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Rediger åkerland"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Eng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Rediger eng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Rediger vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Hageparseller"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Rediger hageparseller"
@@ -27261,25 +27203,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Hage"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Rediger hage"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Gress"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Rediger gress"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Friområde"
@@ -27287,10 +27229,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Rediger friområde"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Offentlig"
@@ -27298,20 +27240,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Rediger offentlig"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Rediger park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Friluftsområde"
@@ -27319,5 +27261,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Rediger friluftsområde"
@@ -27325,15 +27267,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Boligområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Rediger boligområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Gravlund"
@@ -27341,9 +27283,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Rediger gravlund"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Kirkegård"
@@ -27351,39 +27293,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Rediger kirkegård"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Forretninger"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Rediger forretninger"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Næringsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Rediger næringsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Rediger industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Jernbanegrunn"
@@ -27391,15 +27333,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Rediger jernbanegrunn"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Millitært"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Rediger millitært"
@@ -27407,50 +27349,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Byggeplass"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Rediger byggeplass"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Rivningsområde"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Rediger rivningsområde"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Byggeområde"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Rediger byggeområde"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Avfallsdeponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Rediger avfallsdeponi"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Steinbrudd"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Rediger steinbrudd"
@@ -27460,5 +27402,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Rediger multipolygon"
@@ -27467,10 +27409,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "ytre linjesegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "indre linjesegment"
@@ -27478,5 +27420,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Svingeforbud"
@@ -27485,5 +27427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Rediger svingeforbud"
@@ -27491,34 +27433,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Forbud"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "venstresving forbudt"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "høyresving forbudt"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "rett frem forbudt"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "u-sving forbudt"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "påbudt høyresving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "påbudt venstresving"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "påbudt rett frem"
@@ -27527,15 +27469,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "fra linje"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "via node eller linje"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "til linje"
@@ -27543,5 +27485,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Rute"
@@ -27550,5 +27492,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Rediger rute"
@@ -27556,5 +27498,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Rutetype"
@@ -27645,5 +27587,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27653,17 +27595,17 @@
 msgstr "sykkel"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "vei"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "ferge"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "ski"
@@ -27723,5 +27665,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27730,9 +27672,9 @@
 msgstr "fotgjenger"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "trikk"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "omkjøring"
@@ -27746,10 +27688,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "T-bane"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Symbolforklaring"
@@ -27757,31 +27699,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Nettverk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "planlagt"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternativ"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "midlertidig"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "forbindelse"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Farge (hex)"
@@ -27790,32 +27732,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "rutesegment"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "neste segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "forrige segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "stoppepunkt"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "neste stoppunkt"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "forrige stoppunkt"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/nl.po
===================================================================
--- /applications/editors/josm/i18n/po/nl.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/nl.po	(revision 20945)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-12 08:38+0000\n"
-"Last-Translator: Foppe Benedictus <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:18+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Dutch <nl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:43+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:50+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1209,5 +1209,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Kan objecten niet buiten de wereld plaatsen."
@@ -1520,5 +1520,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2295,9 +2295,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2380,22 +2380,22 @@
 msgstr "Tekenen beëindigen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Uittrekken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Gebieden aanmaken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Weg uittrekken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Verplaats een segment langs zijn normaal, en laat de muisknop los"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
@@ -2403,5 +2403,5 @@
 "loslaten."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2423,6 +2423,6 @@
 "te spelen; SHIFT+loslaten om het geluid op dat punt te synchroniseren."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2434,9 +2434,9 @@
 msgstr "Selecteer"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Objecten selecteren, verplaatsen en roteren"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2445,17 +2445,17 @@
 msgstr[1] "Een virtuele knoop toevoegen en naar {0} wegen verplaatsen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Verplaats elementen"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Verplaats ze"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Verplaatsing ongedaan maken"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2468,9 +2468,9 @@
 "Wilt u ze echt verplaatsen?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "De muisknop loslaten om objecten in het rechthoek te selecteren."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2479,9 +2479,9 @@
 "met dichtstbijzijnde knoop."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "De muisknop loslaten om het roteren te stoppen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3234,5 +3234,5 @@
 msgstr "Toepassen?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3809,17 +3809,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standaard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "verbinding"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Nog niet getagde afbeeldingen"
+msgstr ""
 
 #. teal
@@ -4000,5 +3997,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "spoorweg"
@@ -5286,5 +5283,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alles"
@@ -5703,4 +5700,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5791,5 +5793,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relaties"
@@ -5891,9 +5893,9 @@
 msgstr "Selectie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Laat paneel drijven"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5902,5 +5904,5 @@
 "werkbalk."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klik om de paneelinhoud te verkleinen/vergroten"
@@ -6230,4 +6232,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6240,10 +6248,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6913,145 +6915,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Naam"
@@ -8268,10 +8270,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Soort"
@@ -8279,5 +8281,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8291,17 +8292,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "onbekend"
@@ -9087,11 +9087,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9108,14 +9110,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "laag"
@@ -9651,5 +9653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Beschrijving"
@@ -10726,55 +10728,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11264,5 +11266,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Auto"
@@ -11284,16 +11286,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Fiets"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11323,12 +11326,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Te voet"
@@ -12040,12 +12043,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Straatnaam"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Gemeten waarden"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14303,6 +14304,7 @@
 msgstr "Sporen uploaden"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14393,5 +14395,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adresinterpolatie"
@@ -14578,5 +14580,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14617,19 +14619,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Gebouwen"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14637,5 +14639,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14648,10 +14650,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14693,7 +14695,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Bufferbestand Lambert-zone 2 (.2)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14835,5 +14836,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16692,5 +16693,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Openbaar vervoer"
@@ -16742,5 +16743,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Waypoints"
@@ -17315,4 +17316,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Soort"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17469,4 +17487,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Verkeersbeperking"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Verkeersbeperking"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18226,5 +18258,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygoon"
@@ -19520,7 +19552,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referentie"
@@ -19537,5 +19569,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Lanen"
@@ -19553,4 +19585,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19558,9 +19591,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. snelheid (km/u)"
@@ -19588,15 +19620,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19607,11 +19633,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Éénrichtingsweg"
@@ -19631,15 +19656,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19656,11 +19679,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19681,8 +19704,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19700,11 +19723,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19724,6 +19747,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19741,11 +19764,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Verdieping"
@@ -19765,6 +19788,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19782,11 +19805,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Verhoging"
@@ -19924,5 +19947,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19931,12 +19954,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19944,13 +19970,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Breedte (meters)"
@@ -19979,24 +20005,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Oppervlakte"
@@ -20008,5 +20030,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20020,11 +20042,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "verhard"
@@ -20032,10 +20053,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "onverhard"
@@ -20043,10 +20064,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -20054,11 +20075,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -20066,10 +20086,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -20077,10 +20097,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "oerbos"
@@ -20088,10 +20108,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -20099,11 +20119,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "kinderhoofdjes"
@@ -20111,10 +20130,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "gravel"
@@ -20122,10 +20141,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -20133,10 +20152,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -20144,10 +20163,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20155,10 +20174,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "gras"
@@ -20166,10 +20185,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "zand"
@@ -20177,10 +20196,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "gebied"
@@ -20261,6 +20280,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Weg (onbekend soort)"
@@ -20269,5 +20287,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Een weg van onbekend soort bewerken"
@@ -20275,6 +20293,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Werkzaamheden"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Een autosnelweg met werkzaamheden bewerken"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Splitsing"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rotonde"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Toegangsbeperkingen"
@@ -20283,15 +20330,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Toegangsbeperkingen bewerken"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Tol"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Doodlopende weg"
@@ -20299,5 +20346,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Toegang"
@@ -20339,28 +20386,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ja"
@@ -20373,10 +20419,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20390,10 +20436,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20417,97 +20463,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "toestemming"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "landbouw"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nee"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "bestemmingsverkeer"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Goederen"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Zwaar vrachtverkeer"
@@ -20522,10 +20568,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Ruiters"
@@ -20541,10 +20587,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorfiets"
@@ -20559,19 +20605,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Gemotoriseerd verkeer"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Openbaar vervoer"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. snelheid (km/u)"
@@ -20579,20 +20625,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. gewicht (tonnen)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. hoogte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. breedte (meters)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. lengte (meters)"
@@ -20600,5 +20646,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rotonde"
@@ -20609,5 +20655,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Een splitsing bewerken"
@@ -20627,10 +20673,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "Autosnelweg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "op- en afrit autosnelweg"
@@ -20652,10 +20698,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "autoweg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "op- en afrit autoweg"
@@ -20677,10 +20723,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "provinciale weg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "op- en afrit provinciale weg"
@@ -20702,5 +20748,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20715,9 +20761,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "weg buiten bebouwde kom"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "niet geklassificeerd"
@@ -20731,9 +20777,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "woongebied"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "woonerf"
@@ -20763,10 +20809,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "toegangsweg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "busbaan"
@@ -20796,5 +20842,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20806,10 +20852,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Een brug bewerken"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Een tunnel bewerken"
@@ -20817,39 +20863,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Wegen"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Werkzaamheden"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Een autosnelweg met werkzaamheden bewerken"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Splitsing"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rotonde"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Track"
@@ -20858,73 +20875,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Track bewerken"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Pad"
@@ -20933,38 +20918,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Pad bewerken"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Sneeuwscooter"
@@ -20973,5 +20988,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20979,5 +20994,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Ruiterpad bewerken"
@@ -20985,5 +21000,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21001,11 +21016,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Fietspad bewerken"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -21013,5 +21028,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21019,5 +21034,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21025,5 +21040,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -21032,15 +21047,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Voetpad bewerken"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Trap"
@@ -21050,10 +21061,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Trap bewerken"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Snelwegkruising"
@@ -21061,15 +21072,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Snelwegkruising bewerken"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Diensten"
@@ -21077,5 +21088,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Rustplaats bewerken"
@@ -21115,17 +21126,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Bedrijf"
@@ -21134,5 +21145,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Verkeerslicht"
@@ -21142,5 +21153,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Soort voetgangersoversteekplaats"
@@ -21149,27 +21160,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "zonder verkeerslichten"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "verkeerslichten"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "eiland"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "ongemarkeerd"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Als ruiter oversteken"
@@ -21177,6 +21188,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Op de fiets oversteken"
@@ -21185,11 +21196,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Klaar-over"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21197,30 +21208,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelicaan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop"
@@ -21228,5 +21239,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Voetgangersoversteekplaats"
@@ -21235,14 +21246,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21250,33 +21261,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21284,5 +21295,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21290,5 +21301,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-rotonde"
@@ -21299,14 +21310,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Richting"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "met de klok mee"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Draaicirkel"
@@ -21316,5 +21327,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Stadsgrens"
@@ -21322,15 +21333,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Bord stadsgrens bewerken"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Tweede naam"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Snelheidscamera"
@@ -21339,5 +21350,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Praatpaal"
@@ -21345,5 +21356,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21351,5 +21362,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21357,5 +21368,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21365,10 +21376,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Doorwaadplek"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Doorwaadplek bewerken"
@@ -21376,5 +21387,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Bergpas"
@@ -21382,5 +21393,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Bergpas bewerken"
@@ -21392,7 +21403,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Stijging"
@@ -21400,5 +21411,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barrières"
@@ -21406,5 +21417,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Verkeerspaal"
@@ -21412,5 +21423,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Verkeerspaal bewerken"
@@ -21455,16 +21466,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Toegestaan verkeer:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21473,5 +21484,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Blok"
@@ -21479,5 +21490,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Wildrooster"
@@ -21485,10 +21496,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Wildrooster bewerken"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bussluis"
@@ -21496,15 +21507,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Pennen"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Spijkers bewerken"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Tolpoort"
@@ -21512,5 +21523,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Tolpoort bewerken"
@@ -21518,10 +21529,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Grenspost"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Grenspost bewerken"
@@ -21531,5 +21542,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Haag"
@@ -21540,22 +21551,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Hek"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Muur"
@@ -21563,5 +21574,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Stadsmuur"
@@ -21570,5 +21581,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Stutmuur"
@@ -21580,10 +21591,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Ingang"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Ingang bewerken"
@@ -21591,5 +21602,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Poort"
@@ -21597,50 +21608,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Poort bewerken"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Slagboom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Slagboom bewerken"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Draadhek"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Draadhek bewerken"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Botspoort"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Botspoort bewerken"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Sluipdoorhek"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Sluipdoorhek bewerken"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Overstap"
@@ -21648,25 +21659,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Overstap bewerken"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Gekoppelde deuren"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Gekoppelde deuren bewerken"
@@ -21677,11 +21688,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Water"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Bron"
@@ -21689,5 +21700,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Bron bewerken"
@@ -21695,5 +21706,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Sloot"
@@ -21701,10 +21712,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Sloot bewerken"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21712,10 +21723,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Stroom"
@@ -21723,10 +21734,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Stroom bewerken"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanaal"
@@ -21734,10 +21745,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Kanaal bewerken"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Rivier"
@@ -21747,5 +21758,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Rivier bewerken"
@@ -21753,15 +21764,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Water bewerken"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Land bewerken"
@@ -21769,15 +21780,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Estuarium"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Estuarium bewerken"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Reservoir"
@@ -21785,15 +21796,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Reservoir bewerken"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Ondergronds reservoir"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Ondergronds reservoir bewerken"
@@ -21801,5 +21812,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Rivierbank"
@@ -21808,10 +21819,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Rivierbank bewerken"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Drasland"
@@ -21822,14 +21833,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Drasland bewerken"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Moeras"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "veen"
@@ -21843,35 +21854,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "moeras"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "rietveld"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "Zoutwatermoeras"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "slik"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangroven"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Modder"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Modder bewerken"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strand"
@@ -21879,20 +21890,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Strand bewerken"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Baai"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Baai bewerken"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Klif"
@@ -21900,10 +21911,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Klif bewerken"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Kustlijn"
@@ -21911,5 +21922,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Kustlijn bewerken"
@@ -21917,5 +21928,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Veerpontroute"
@@ -21923,5 +21934,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Veerpontroute bewerken"
@@ -21930,5 +21941,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Scheepswerf"
@@ -21936,10 +21947,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Scheepswerf bewerken"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dok"
@@ -21947,5 +21958,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Dok bewerken"
@@ -21953,5 +21964,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Dam"
@@ -21959,15 +21970,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Dam bewerken"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Waterwegpunt"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Sluis"
@@ -21976,5 +21987,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Stuw"
@@ -21982,20 +21993,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Stuw bewerken"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Waterval"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Waterval bewerken"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Zwaaiplaats"
@@ -22004,15 +22015,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Jachthaven"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Jachthaven bewerken"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Pier"
@@ -22020,10 +22031,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Pier bewerken"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Veerbootterminal"
@@ -22031,10 +22042,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Veerbootterminal bewerken"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Trailerhelling"
@@ -22044,20 +22055,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Trailerhelling bewerken"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Spoorweg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Spoor"
@@ -22065,5 +22076,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Spoor bewerken"
@@ -22093,86 +22104,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standaard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22184,8 +22120,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22199,29 +22135,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "tuin"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "nevenweg"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "privéoprit"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22234,8 +22170,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22306,8 +22242,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22319,8 +22255,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltage"
@@ -22333,8 +22269,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22347,23 +22283,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Smalspoor"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Smalspoor bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22371,50 +22307,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Monorail bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Museumspoor"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Een museumspoorweg bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Sneltram"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Sneltram bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Metro bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tram"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Tram bewerken"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Busbaan"
@@ -22422,5 +22358,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Busbaan bewerken"
@@ -22429,10 +22365,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Ongebruikt spoor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Ongebruikt spoor bewerken"
@@ -22441,9 +22377,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Optionele soorten"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Verwijderd spoor"
@@ -22452,5 +22388,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Bewaakte spoorwegovergang"
@@ -22459,5 +22395,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Onbewaakte spporwegovergang"
@@ -22467,5 +22403,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22473,5 +22409,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Draaiplateau"
@@ -22480,5 +22416,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22487,10 +22423,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Kabelbaan"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Stoeltjeslift"
@@ -22498,10 +22434,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Stoeltjeslift bewerken"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Sleeplift"
@@ -22509,10 +22445,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Sleeplift bewerken"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Kabinebaan"
@@ -22520,10 +22456,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Kabinebaan bewerken"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22531,10 +22467,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22543,5 +22479,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22549,5 +22485,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22556,5 +22492,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22562,5 +22498,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Brandstof"
@@ -22570,62 +22506,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Brandstof bewerken"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22683,32 +22619,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Openingstijden"
@@ -22767,165 +22703,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22942,5 +22878,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22950,5 +22886,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Parkeerplaats bewerken"
@@ -22959,25 +22895,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referentienummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "meerlaags"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "oppervlak"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "ondergronds"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22986,48 +22922,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Parkeergeld"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Gehandicaptenplaats"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Wasstraat"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Autowasstraat bewerken"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Garage"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Autogarage bewerken"
@@ -23035,5 +22971,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Verhuur"
@@ -23042,10 +22978,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Autoverhuur bewerken"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Autodelen"
@@ -23053,5 +22989,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Autodelen bewerken"
@@ -23059,10 +22995,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Fietsenstalling bewerken"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capaciteit"
@@ -23071,10 +23007,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Fietsenverhuur bewerken"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23084,5 +23020,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23090,5 +23026,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-referentie"
@@ -23096,5 +23032,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Onbemand station"
@@ -23102,5 +23038,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Onbemand station bewerken"
@@ -23108,5 +23044,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Tramhalte"
@@ -23115,5 +23051,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Tramhalte bewerken"
@@ -23121,5 +23057,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Perron"
@@ -23128,5 +23064,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Perron bewerken"
@@ -23138,5 +23074,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Referentie (tracknummer)"
@@ -23144,10 +23080,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Gebied"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Metroingang"
@@ -23156,10 +23092,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Metroingang bewerken"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Rolstoel"
@@ -23168,5 +23104,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Busstation"
@@ -23175,5 +23111,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Busstation bewerken"
@@ -23181,5 +23117,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Bushalte"
@@ -23189,5 +23125,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Bushalte bewerken"
@@ -23196,6 +23132,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Schuilplaats"
@@ -23203,19 +23139,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bank"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Busstation"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Busplatform bewerken"
@@ -23223,5 +23159,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23229,5 +23165,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Taxistandplaats bewerken"
@@ -23235,10 +23171,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Luchthaven"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23246,5 +23182,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23252,10 +23188,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23264,5 +23200,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23270,5 +23206,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23276,5 +23212,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23282,5 +23218,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23288,5 +23224,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23294,5 +23230,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23302,5 +23238,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23310,5 +23246,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23319,6 +23255,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Baken"
@@ -23328,5 +23264,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23335,5 +23271,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23341,5 +23277,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23347,15 +23283,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Accomodatie"
@@ -23367,5 +23303,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23374,15 +23310,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Hotel bewerken"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Sterren"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23390,20 +23326,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Motel bewerken"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Pension"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Pension bewerken"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chalet"
@@ -23411,10 +23347,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Chalet bewerken"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostel"
@@ -23422,30 +23358,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Hostel bewerken"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Berghut"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Berghut bewerken"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Caravanpark"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Caravanpark bewerken"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Kampeerterrein"
@@ -23453,10 +23389,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Kampeerterrein bewerken"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Eten en drinken"
@@ -23467,5 +23403,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -23473,5 +23409,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Restaurant bewerken"
@@ -23479,5 +23415,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Keuken"
@@ -23485,73 +23421,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "Italiaanse keuken"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "Chinese keuken"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "Grieks"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "Duits"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "Indiaas"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "lokaal"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "Kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "Turks"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "Oosters"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "Thais"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "Mexicaans"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "Japans"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -23559,17 +23495,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast-Food-restaurant bewerken"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Café"
@@ -23577,9 +23513,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Café bewerken"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Kroeg"
@@ -23587,18 +23523,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Kroeg bewerken"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Biergarten bewerken"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23606,9 +23542,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nachtclub"
@@ -23616,24 +23552,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Nachtclub bewerken"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Toerisme"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Attractie"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Attractie bewerken"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -23641,9 +23577,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Museum bewerken"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Dierentuin"
@@ -23652,9 +23588,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Dierentuin bewerken"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Uitkijkpunt"
@@ -23662,24 +23598,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Uitkijktoren"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Themapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Themapart bewerken"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Kunstwerk"
@@ -23687,5 +23623,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Kunstwerk bewerken"
@@ -23693,19 +23629,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Kaart"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23743,5 +23679,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23749,28 +23685,28 @@
 msgstr "straat"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23780,5 +23716,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23786,5 +23722,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Wandelen"
@@ -23792,6 +23728,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Fietsen"
@@ -23799,5 +23735,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23805,6 +23741,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skiën"
@@ -23812,5 +23748,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23818,46 +23754,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "geschiedenis"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "natuur"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "Wild"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23865,29 +23801,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Schuilplaats bewerken"
@@ -23895,25 +23831,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Vuurplaats"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picnicplek"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Picnicplek bewerken"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historische locaties"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Kasteel"
@@ -23922,19 +23858,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Kasteel bewerken"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruïne"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Ruïne bewerken"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Archeologische plaats"
@@ -23943,9 +23879,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Archeologische plaats bewerken"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Slagveld"
@@ -23953,10 +23889,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Slagveld bewerken"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23964,5 +23900,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23970,15 +23906,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Monument bewerken"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Herdenkingsplek"
@@ -23986,55 +23922,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Herdenkingsplek bewerken"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kruis langs de weg"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Kruis langs de weg bewerken"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Kapelletje langs de weg"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Kapelletje bewerken"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Vrije tijd"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Zwembad"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Zwembad bewerken"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Speelveld"
@@ -24042,35 +23978,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Speelveld bewerken"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Visstek"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Visstek bewerken"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportfaciliteiten"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadion bewerken"
@@ -24084,6 +24020,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "sport selecteren:"
@@ -24475,6 +24411,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24508,225 +24444,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "Meervoudig"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "Boogschieten"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "Atletiek"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "Australisch football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "Honkbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "Basketball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "Boules"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "Bowling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "Kanoën"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "Klimmen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "Cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "Cricket netten"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "Croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "Fietsen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "Hondenraces"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "Paardensport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "Football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "Golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "Turnen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "Hockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "Paardenraces"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "Motorsport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "Pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "Badminton"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "Rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "Schieten"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "Skateboarden"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "Schaatsen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "Skiën"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "Voetbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "Zwemmen"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "Tafeltennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "Tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sportcentrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Sportcentrum bewerken"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Sportveld"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Sportveld bewerken"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Wedstrijdbaan"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Wedstrijdbaan bewerken"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbaan"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golfbaan bewerken"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minigolf bewerken"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Verzameling"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Verzameling bewerken"
@@ -24765,21 +24701,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "soort"
@@ -24818,203 +24754,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "Sportveld"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "Sportcentrum"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "Stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletiek"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Atletiek bewerken"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Boogschieten"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Boogschieten bewerken"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klimmen"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Klimmen bewerken"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoën"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kanoën bewerken"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Fietsen bewerken"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hondenracen"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Hondenracen bewerken"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Paardenracen"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Paardenracen bewerken"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Turnen"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Turnen bewerken"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorracen"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motorracen bewerken"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Schaatsen"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Schaatsen bewerken"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Skateboard bewerken"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Zwemmen"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Zwemmen bewerken"
@@ -25022,52 +24958,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Skiën bewerken"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Soort piste"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "bergafwaarts"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "Scandinavisch"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Moeilijkheidsgraad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "beginner"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "eenvoudig"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Schieten"
@@ -25075,177 +25011,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Schieten bewerken"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Balsporten"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Voetbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Voetbal bewerken"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Football bewerken"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australisch football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Australisch football bewerken"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Honkbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Honkbal bewerken"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketball"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketball bewerken"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golf bewerken"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfbaan"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule bewerken"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowlen"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowlen bewerken"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Cricket bewerken"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnetten"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Cricketnetten bewerken"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Croquet bewerken"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockey bewerken"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelota bewerken"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Badminton"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Badminton bewerken"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugby bewerken"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tafeltennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Tafeltennis bewerken"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennis bewerken"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Gebouw"
@@ -25253,5 +25189,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Openbare gebouw"
@@ -25259,10 +25195,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Openbare gebouwen bewerken"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Stadhuis"
@@ -25270,10 +25206,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Stadhuis bewerken"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassade"
@@ -25281,10 +25217,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Ambassade bewerken"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Gerechtsgebouw"
@@ -25293,10 +25229,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Gerechtsgebouw bewerken"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Gevangenis"
@@ -25305,10 +25241,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Gevangenis bewerken"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Politie"
@@ -25318,10 +25254,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Politie bewerken"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandweerkazerne"
@@ -25330,10 +25266,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Brandweerkazerne bewerken"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkantoor"
@@ -25341,5 +25277,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Postkantoor bewerken"
@@ -25347,15 +25283,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Kinderopvang"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Kinderopvang bewerken"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "School"
@@ -25363,10 +25299,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "School bewerken"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universiteit"
@@ -25374,10 +25310,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universiteit bewerken"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Campus"
@@ -25385,5 +25321,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Campus bewerken"
@@ -25391,5 +25327,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Bioscoop"
@@ -25398,10 +25334,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Bioscoop bewerken"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotheek"
@@ -25410,9 +25346,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Bibliotheek bewerken"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kunstcentrum"
@@ -25420,10 +25356,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Kunstcentrum bewerken"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Theater"
@@ -25432,10 +25368,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Theater bewerken"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Religieus gebouw"
@@ -25445,5 +25381,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Religieus gebouw bewerken"
@@ -25452,6 +25388,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religie"
@@ -25460,66 +25396,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "Bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "Boeddhisme"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "Christelijk"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "Hindoestaans"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "Jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "Joods"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "Moslim"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "Sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "Spirtualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "Taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Benaming"
@@ -25528,81 +25464,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "Anglicaan"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "Baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "Katholiek"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "Evangelist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "Jehovahs getuigen"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "Luthers"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "Methodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "Mormoon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "Orthodox"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "Protestant"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "Quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adressen"
@@ -25611,5 +25547,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adresinformatie bewerken"
@@ -25617,5 +25553,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Huisnummer"
@@ -25623,25 +25559,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Huisnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Straatnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Stadsnaam"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postcode"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landcode"
@@ -25650,5 +25586,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adresinterpolatie bewerken"
@@ -25656,61 +25592,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Nummeringschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "oneven"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "even"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Bouwwerken"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabriek"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Fabriek bewerken"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Toren"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Toren bewerken"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25718,25 +25654,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Watertoren"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Watertoren bewerken"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Olieopslag"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Olieopslag bewerken"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Vuurtoren"
@@ -25744,10 +25680,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Vuurtoren bewerken"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Windmolen"
@@ -25755,10 +25691,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Windmolen bewerken"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Pijplijn"
@@ -25767,41 +25703,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Pijplijn bewerken"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Locatie"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Afvalzuivering"
@@ -25811,10 +25747,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Afvalzuivering bewerken"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kraan"
@@ -25822,5 +25758,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Kraan bewerken"
@@ -25828,10 +25764,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Baken bewerken"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Uitkijkpunt"
@@ -25839,10 +25775,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Uitkijkpunt bewerken"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Bewakingscamera"
@@ -25850,23 +25786,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Bewakingscamera bewerken"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Energievoorziening"
@@ -25876,35 +25812,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Energievoorziening bewerken"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "wind"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "water"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossiele brandstoffen"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nucleair"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kolen"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "fotovoltage"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Verdeelstation"
@@ -25913,10 +25849,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Verdeelstation bewerken"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -25925,5 +25861,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Transformatorstation bewerken"
@@ -25931,10 +25867,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Lijnreferentie"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Hoogspanningsmast"
@@ -25945,23 +25881,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Hoogspanningsmast bewerken"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Hoogspanningskabel"
@@ -25970,74 +25906,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Hoogspanningskabels bewerken"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Voorzieningen"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toiletten"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Opmerking"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Postbus"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefoon"
@@ -26046,5 +25982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Een telefoon bewerken"
@@ -26052,5 +25988,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Munten"
@@ -26058,5 +25994,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Briefgeld"
@@ -26064,5 +26000,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Chipknip"
@@ -26070,5 +26006,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Pinpas"
@@ -26076,15 +26012,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Creditkaart"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefoonkaart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recycling"
@@ -26093,5 +26029,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Recyclebakken"
@@ -26099,35 +26035,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterijen"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Flessen"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Kleding"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Schroot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26135,5 +26071,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26142,31 +26078,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26245,5 +26181,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26253,31 +26189,31 @@
 msgstr "groen"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Vogeluitkijkpost"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Vogeluitkijkpost bewerken"
@@ -26286,30 +26222,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Hoogte"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "Kruiphoogte"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "Bukhoogte"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "Stahoogte"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Verborgen"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Afgesloten"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontein"
@@ -26318,10 +26254,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Fontein bewerken"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Drinkwater"
@@ -26330,10 +26266,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Drinkwater bewerken"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26342,5 +26278,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26348,5 +26284,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26354,15 +26290,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Winkels"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26370,10 +26306,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Winkel met autoonderdelen bewerken"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26382,28 +26318,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Fietswinkel bewerken"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarkt"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Supermarkt bewerken"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26411,9 +26347,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26421,27 +26357,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Kiosk bewerken"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Slager"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Slager bewerken"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Bakker"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Bakker bewerken"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Bloemist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Bloemist bewerken"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Dranken"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Computerwinkel bewerken"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronica"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Elektronicawinkel bewerken"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Hifi-winkel bewerken"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Meubels"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Meubelzaak bewerken"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Tuincentrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Tuincentrum bewerken"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Doe-het-zelfzaak"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Doe-het-zelfzaak bewerken"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Kantoorartikelen"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Kantoorartikelenwinkel bewerken"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Kapper"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Kapper bewerken"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Schoenen"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Schoenenwinkel bewerken"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Speelgoed"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Speelgoedwinkel bewerken"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Videotheek"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Videotheek bewerken"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Stomerij"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Stomerij bewerken"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Wasserette"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Wasserette bewerken"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Buitensport"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Buitensportzaak bewerken"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Sportzaak bewerken"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Opticiën bewerken"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Verkoopautomaat"
@@ -26449,5 +26599,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Verkoopautomaat bewerken"
@@ -26455,306 +26605,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Producten"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "vervoerskaarten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "overzichtskaart"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkeerbiljet"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "voedsel"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "frisdranken"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "snoepgoed"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "sigaretten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "foto's"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "diervoeder"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "kranten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "speelgoed"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "postzegels"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kaarten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "prepaid-kaarten"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "tegoedbonnen"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "fiets"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "condooms"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampons"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "hondenpoepzakjes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Klantenkaarten"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Slager"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Slager bewerken"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Bakker"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Bakker bewerken"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Bloemist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Bloemist bewerken"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Dranken"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Computerwinkel bewerken"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronica"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Elektronicawinkel bewerken"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Hifi-winkel bewerken"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Meubels"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Meubelzaak bewerken"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Tuincentrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Tuincentrum bewerken"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Doe-het-zelfzaak"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Doe-het-zelfzaak bewerken"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Kantoorartikelen"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Kantoorartikelenwinkel bewerken"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Kapper"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Kapper bewerken"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Schoenen"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Schoenenwinkel bewerken"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Speelgoed"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Speelgoedwinkel bewerken"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Videotheek"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Videotheek bewerken"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Stomerij"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Stomerij bewerken"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Wasserette"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Wasserette bewerken"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Buitensport"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Buitensportzaak bewerken"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Sportzaak bewerken"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Opticiën bewerken"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Geldzaken"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -26762,14 +26704,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Bank bewerken"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Geldautomaat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Geldwisselkantoor"
@@ -26777,5 +26719,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Geldwisselkantoor bewerken"
@@ -26783,15 +26725,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Geldautomaat bewerken"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Gezondheid"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Huisarts"
@@ -26799,18 +26741,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Huisarts bewerken"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Tandarts"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Tandarts bewerken"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apotheek"
@@ -26818,5 +26760,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Apotheek bewerken"
@@ -26824,9 +26766,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Ziekenhuis"
@@ -26834,10 +26776,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Ziekenhuis bewerken"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "EHBO-post"
@@ -26846,5 +26788,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "EHBO-post bewerken"
@@ -26853,20 +26795,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Puntnummer"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefoonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Gebruik de landtoegangscode, b.v. +31 20-3456789)"
@@ -26874,5 +26816,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Dierenarts"
@@ -26881,64 +26823,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Dierenarts bewerken"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Locaties"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Een continent bewerken"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Land bewerken"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Provincie"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Provincie bewerken"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Regio"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Regio bewerken"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr ""
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr ""
@@ -26946,15 +26888,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Stad bewerken"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Dorp"
@@ -26962,10 +26904,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Dorp bewerken"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Deelgemeente"
@@ -26973,25 +26915,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Deelgemeente bewerken"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Klein dorp"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Klein dorp bewerken"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Gehucht"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Gehucht bewerken"
@@ -26999,5 +26941,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -27005,10 +26947,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Eiland"
@@ -27016,10 +26958,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Eiland bewerken"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -27027,5 +26969,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -27033,5 +26975,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Grotingang"
@@ -27039,10 +26981,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Grotingang bewerken"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Bergtop"
@@ -27050,10 +26992,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Bergtop bewerken"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Gletsjer"
@@ -27061,10 +27003,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Gletsjer bewerken"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkaan"
@@ -27072,70 +27014,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Vulkaan bewerken"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Grenzen"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Landsgrens"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Landsgrens bewerken"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Provincie -of gemeentegrens"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Provincie -of gemeentegrens bewerken"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Grens bebouwde kom"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Grens bebouwde kom bewerken"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Grens kiesdistrict bewerken"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Grens Nationaal park bewerken"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Grondgebruik"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Boom"
@@ -27144,15 +27086,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Boom bewerken"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanische naam"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Bos"
@@ -27161,5 +27103,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Bos bewerken"
@@ -27167,17 +27109,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "naaldbomen"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "loofbomen"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "gemengd"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Bosbouw"
@@ -27186,14 +27128,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Bosbouw bewerken"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Natuurreservaat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Natuurreservaat bewerken"
@@ -27201,25 +27143,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Puinhelling"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Puinhelling bewerken"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Kreupelhout"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Kreupelhout bewerken"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -27227,10 +27169,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Heide"
@@ -27238,5 +27180,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Heide bewerken"
@@ -27244,5 +27186,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Boerenerf"
@@ -27251,45 +27193,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Boerenerf bewerken"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Landbouwgrond"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Landbouwgrond bewerken"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Weide"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Weideland bewerken"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Wijngaard"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Wijngaard bewerken"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Volkstuinen"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Volkstuinen bewerken"
@@ -27297,25 +27239,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Tuin"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Tuin bewerken"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Gras"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Gras bewerken"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Stadsgroen"
@@ -27323,10 +27265,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Stadsgroen bewerken"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Algemeen"
@@ -27334,20 +27276,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Algemeen bewerken"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Park bewerken"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Recreatiegebied"
@@ -27355,5 +27297,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Recreatiegebied bewerken"
@@ -27361,15 +27303,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Woongebied"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Woongebied bewerken"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Begraafplaats"
@@ -27377,9 +27319,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Begraafplaats"
@@ -27387,39 +27329,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Begraafplaats bewerken"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Winkelcentrum"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Winkelcentrum bewerken"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Kantoren"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Kantoren bewerken"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrieterrein"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Industrieterrein bewerken"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27427,15 +27369,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militair terrein"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Militair terrein bewerken"
@@ -27443,50 +27385,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Bouwterrein"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Bouwterrein bewerken"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Braakliggende grond"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Braakliggende grond bewerken"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Ontwikkelingsgebied"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Ontwikkelingsgebied bewerken"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Vuilstortplaats"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Vuilstortplaats bewerken"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Mijnbouw"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Mijnbouw bewerken"
@@ -27496,5 +27438,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Multipolygoon bewerken"
@@ -27503,10 +27445,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "buitensegment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "binnensegment"
@@ -27514,5 +27456,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Verkeersbeperking"
@@ -27521,5 +27463,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Verkeersbeperking bewerken"
@@ -27527,34 +27469,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Beperking"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "niet linksaf"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "niet rechtsaf"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "niet rechtdoor"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "niet keren"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "alleen rechtsaf"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "alleen linksaf"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "alleen rechtdoor"
@@ -27563,15 +27505,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "vanaf weg"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "via knoop of weg"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "naar weg"
@@ -27579,5 +27521,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27586,5 +27528,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27592,5 +27534,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27681,5 +27623,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27689,17 +27631,17 @@
 msgstr "fiets"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "bus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "straat"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "veerboot"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27759,5 +27701,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27766,9 +27708,9 @@
 msgstr "voet"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tram"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "omweg"
@@ -27782,10 +27724,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27793,31 +27735,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Netwerk"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "voorgesteld"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternatief"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "tijdelijk"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "verbinding"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Kleur (hex)"
@@ -27826,32 +27768,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standaard"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/pl.po
===================================================================
--- /applications/editors/josm/i18n/po/pl.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/pl.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-14 07:55+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-19 12:36+0000\n"
 "Last-Translator: Rafał <Unknown>\n"
 "Language-Team: Polish <josm-lang-pl@googlegroups.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:42+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:48+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: POLAND\n"
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -614,15 +614,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:81
 msgid "There are no open changesets"
-msgstr "Nie ma otwartych changesetów"
+msgstr "Nie ma otwartych zestawów zmian"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:58
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:82
 msgid "No open changesets"
-msgstr "Brak otwartych changesetów"
+msgstr "Brak otwartych zestawów zmian"
 
 #: ../core/src/org/openstreetmap/josm/actions/CloseChangesetAction.java:89
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:44
 msgid "Downloading open changesets ..."
-msgstr "Pobieram otwarte changesety ..."
+msgstr "Pobieram otwarte zestawy zmian..."
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:49
@@ -809,5 +809,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64
 msgid "Enter the ID of the object that should be downloaded"
-msgstr ""
+msgstr "Wprowadź ID obiektu który ma zostać pobrany"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77
@@ -1076,5 +1076,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59
 msgid "You can also paste an URL from www.openstreetmap.org"
-msgstr "MOżesz też wklejić adres url z www.openstreetmap.org"
+msgstr "Możesz też wklejić adres url z www.openstreetmap.org"
 
 #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91
@@ -1202,5 +1202,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Nie można przenieść zaznaczonych obiektów poza świat."
@@ -1253,9 +1253,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
 msgid "Open file"
-msgstr ""
+msgstr "Otwórz plik"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:252
 msgid "Opening 1 file..."
-msgstr ""
+msgstr "Otwieram 1 plik..."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:254
@@ -1516,5 +1516,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2272,9 +2272,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2357,26 +2357,26 @@
 msgstr "Zakończ rysowanie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Wytłocz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Tworzenie obszarów."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Wytłocz drogę"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Narysuj prostokąt pożądanych rozmiarów i zwolnij przycisk myszy."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2394,6 +2394,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2405,9 +2405,9 @@
 msgstr "Zaznacz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Wybieranie, przesuwanie i obracanie obiektów"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2416,17 +2416,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Więcej elementów"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Przesuń je"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Cofnij przesunięcie"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2439,9 +2439,9 @@
 "Czy na pewno je przesunąć?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Zwolnij przycisk myszki, aby zaznaczyć obiekty w kwadracie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2450,9 +2450,9 @@
 "najbliższym węzłem."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Zwolnij przycisk myszy aby zakończyć obracanie."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3179,5 +3179,5 @@
 msgstr "Zastosować?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3765,17 +3765,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standardowy"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "połaczenie"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "nieotagowany"
+msgstr ""
 
 #. teal
@@ -3956,5 +3953,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "tory kolejowe"
@@ -4421,5 +4418,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50
 msgid "Click to cancel the current operation"
-msgstr ""
+msgstr "Kliknij aby przerwać trwającą operację"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86
@@ -4474,14 +4471,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:310
 msgid "To delete"
-msgstr ""
+msgstr "Do usunięcia"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:319
 msgid "From Relation"
-msgstr ""
+msgstr "Z relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:328
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java:33
 msgid "Pos."
-msgstr ""
+msgstr "Pozycja"
 
 #. the role column
@@ -4498,9 +4495,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:352
 msgid "Click to close the dialog and remove the object from the relations"
-msgstr ""
+msgstr "Kliknij aby zamknąć i usunąć obiekty z relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:365
 msgid "Click to close the dialog and to abort deleting the objects"
-msgstr ""
+msgstr "Kliknij aby zamknąć i anulować usuwanie obiektów"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
@@ -4516,9 +4513,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:259
 msgid "from tile"
-msgstr ""
+msgstr "od kafelka"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:262
 msgid "up to tile"
-msgstr ""
+msgstr "aż do kafelka"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
@@ -4906,5 +4903,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java:27
 msgid "Node"
-msgstr ""
+msgstr "Węzeł"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
@@ -5204,5 +5201,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:282
 msgid "No conflicts to resolve"
-msgstr ""
+msgstr "Brak konfliktów do rozwiązania"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java:344
@@ -5231,5 +5228,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "wszystkie"
@@ -5340,5 +5337,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:32
 msgid "Keep"
-msgstr ""
+msgstr "Zachowaj"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java:33
@@ -5356,5 +5353,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:81
 msgid "Role:"
-msgstr ""
+msgstr "Rola:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:83
@@ -5375,5 +5372,5 @@
 msgctxt "tag"
 msgid "Key:"
-msgstr ""
+msgstr "Klucz:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
@@ -5384,5 +5381,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:148
 msgid "Value:"
-msgstr ""
+msgstr "Wartość:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
@@ -5449,9 +5446,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128
 msgid "Changesets"
-msgstr ""
+msgstr "Zestawy zmian"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:255
 msgid "Open the list of changesets in the current layer."
-msgstr ""
+msgstr "Otwórz listę zmian aktywnej warstwy"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
@@ -5476,5 +5473,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:190
 msgid "Show info"
-msgstr ""
+msgstr "Pokaż szczegóły"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:427
@@ -5646,4 +5643,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5715,5 +5717,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504
 msgid "Duplicate this layer"
-msgstr ""
+msgstr "Skopiuj warstwę"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603
@@ -5734,5 +5736,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relacje"
@@ -5757,5 +5759,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1375
 msgid "Create a copy of this relation and open it in another editor window"
-msgstr "Utwórz kopię tej relacji i otwórz ją w nowym oknie edytora relacji"
+msgstr "Tworzy kopię tej relacji i otwiera ją w nowym oknie edytora relacji"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:432
@@ -5834,9 +5836,9 @@
 msgstr "Zaznaczenie: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Oderwij panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5844,5 +5846,5 @@
 "Zamknij panel. Możesz ponownie go otworzyć używając przycisków po lewej."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknij aby zminimalizować/maksymalizować zawartość panela"
@@ -6172,4 +6174,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6182,10 +6190,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6855,145 +6857,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nazwa"
@@ -8180,5 +8182,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:283
 msgid "Search ..."
-msgstr ""
+msgstr "Szukaj ..."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:285
@@ -8211,10 +8213,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Rodzaj"
@@ -8222,5 +8224,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8234,17 +8235,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "nieznany"
@@ -8294,4 +8294,7 @@
 "network problem, please check<br>your internet connection</html>"
 msgstr ""
+"<html>Nie można otworzyć strony pomocy pod adresem {0}.<br>Jest to "
+"spowodowane najprawdopodobniej problemem z siecią, sprawdź <br>swoje "
+"połączenie z internetem</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:360
@@ -8302,10 +8305,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:393
 msgid "Open the current help page in an external browser"
-msgstr ""
+msgstr "Otwiera tę stronę pomocy w zewnętrznej przeglądarce"
 
 #. putValue(NAME, tr("Edit"));
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:405
 msgid "Edit the current help page"
-msgstr ""
+msgstr "Edytuje tę stronę pomocy"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
@@ -8819,5 +8822,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57
 msgid "No"
-msgstr ""
+msgstr "Nie"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:47
@@ -8849,5 +8852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:83
 msgid "Please select a file"
-msgstr ""
+msgstr "Proszę wybrać plik"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:86
@@ -8947,5 +8950,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:323
 msgid "Discard and Delete"
-msgstr ""
+msgstr "Porzuć i wyjdź"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
@@ -9010,11 +9013,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9031,14 +9036,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Warstwa"
@@ -9046,18 +9051,18 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:28
 msgid "Should upload?"
-msgstr ""
+msgstr "Wysłać?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:36
 msgid "Should save?"
-msgstr ""
+msgstr "Zapisać?"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:44
 msgid "Filename"
-msgstr ""
+msgstr "Nazwa pliku"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:53
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:462
 msgid "Upload"
-msgstr ""
+msgstr "Wyślij"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:56
@@ -9575,5 +9580,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Opis"
@@ -10642,55 +10647,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11165,5 +11170,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Samochód"
@@ -11185,16 +11190,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Rowery"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11224,12 +11230,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Ruch pieszy"
@@ -11936,12 +11942,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nazwa ulicy"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Zmierzone wartości"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -12203,5 +12207,5 @@
 msgctxt "server"
 msgid "Port:"
-msgstr ""
+msgstr "Port:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
@@ -12212,9 +12216,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
 msgid "Password:"
-msgstr ""
+msgstr "Hasło:"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:230
 msgid "No proxy"
-msgstr ""
+msgstr "Bez serwera proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:242
@@ -14202,6 +14206,7 @@
 msgstr "Wyślij ślady"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14292,5 +14297,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolacja adresów"
@@ -14477,5 +14482,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14516,19 +14521,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budynki"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14536,5 +14541,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14547,10 +14552,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14733,5 +14738,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16555,5 +16560,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Transport publiczny"
@@ -16605,5 +16610,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Punkty drogowe"
@@ -17174,4 +17179,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Rodzaj"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17328,4 +17350,18 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "ograniczenia skrętu"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "ograniczenia skrętu"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18083,5 +18119,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19356,7 +19392,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Numer"
@@ -19373,5 +19409,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Liczba pasów ruchu"
@@ -19389,4 +19425,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19394,9 +19431,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. prędkość (km/h)"
@@ -19424,15 +19460,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19443,11 +19473,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "jednokierunkowa"
@@ -19467,15 +19496,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19492,11 +19519,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19517,8 +19544,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19536,11 +19563,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "tunel"
@@ -19560,6 +19587,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19577,11 +19604,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "wykop"
@@ -19601,6 +19628,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19618,11 +19645,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "nasyp"
@@ -19760,5 +19787,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19767,12 +19794,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19780,13 +19810,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Szerokość (w metrach)"
@@ -19815,24 +19845,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Nawierzchnia"
@@ -19844,5 +19870,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19856,11 +19882,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19868,10 +19893,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19879,10 +19904,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19890,11 +19915,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19902,10 +19926,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19913,10 +19937,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "Las naturalny"
@@ -19924,10 +19948,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19935,11 +19959,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "bruk"
@@ -19947,10 +19970,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "żwir"
@@ -19958,10 +19981,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19969,10 +19992,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19980,10 +20003,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19991,10 +20014,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "trawa"
@@ -20002,10 +20025,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "piach"
@@ -20013,10 +20036,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "grunt"
@@ -20097,6 +20120,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "droga (nieokreślona)"
@@ -20105,5 +20127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Edycja drogi nieokreślonego rodzaju"
@@ -20111,6 +20133,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "w budowie"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Edycja drogi w budowie"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Skrzyżowanie"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rondo"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "ograniczenia na drodze"
@@ -20119,15 +20170,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Edycja ograniczeń na drodze"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "bramka (opłata)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "ślepa ulica"
@@ -20135,5 +20186,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Dostęp do drogi"
@@ -20175,28 +20226,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "tak"
@@ -20209,10 +20259,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20226,10 +20276,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20253,97 +20303,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "dopuszczalny"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "dla rolnictwa"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "dla wyznaczonych pojazdów"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Zaopatrzenie"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Samochody dostawcze"
@@ -20358,10 +20408,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Konie"
@@ -20377,10 +20427,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocykle"
@@ -20395,19 +20445,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Samochody"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Transport publiczny"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. prędkość (km/h)"
@@ -20415,20 +20465,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. ciężar (w tonach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Maks. wysokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Maks. szerokość (w metrach)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Maks. długość (w metrach)"
@@ -20436,5 +20486,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "rondo"
@@ -20445,5 +20495,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Edycja skrzyżowania"
@@ -20463,10 +20513,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "autostrada"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "ciąg pieszy"
@@ -20488,10 +20538,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "droga ekspresowa"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "droga ekspresowa - dojazd"
@@ -20513,10 +20563,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "droga krajowa"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "droga krajowa - dojazd"
@@ -20538,5 +20588,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20551,9 +20601,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "droga powiatowa"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "droga gminna"
@@ -20567,9 +20617,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "droga lokalna"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "strefa zamieszkania"
@@ -20599,10 +20649,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "droga serwisowa"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "wydzielony pas autobusowy"
@@ -20632,5 +20682,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20642,10 +20692,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Edycja mostu"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Edycja tunelu"
@@ -20653,39 +20703,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Drogi"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "w budowie"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Edycja drogi w budowie"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Skrzyżowanie"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rondo"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "droga gruntowa"
@@ -20694,73 +20715,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Edycja drogi gruntowej"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "ścieżka"
@@ -20769,38 +20758,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Edycja ścieżki"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Narty"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Skuter śnieżny"
@@ -20809,5 +20828,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20815,5 +20834,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Edycja ścieżki do jazdy konnej"
@@ -20821,5 +20840,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20837,11 +20856,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Edycja ścieżki rowerowej"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20849,5 +20868,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20855,5 +20874,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20861,5 +20880,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20868,15 +20887,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Edycja drogi dla pieszych"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "schody"
@@ -20886,10 +20901,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Edycja schodów"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "skrzyżowanie autostrad"
@@ -20897,15 +20912,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Edycja skrzyżowania autostrad"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Numer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "miejsce obsługi podróżnych"
@@ -20913,5 +20928,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Edycja miejsca obsługi podróżnych"
@@ -20951,17 +20966,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operator"
@@ -20970,5 +20985,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "sygnalizacja świetlna"
@@ -20978,5 +20993,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Typ przejścia dla pieszych"
@@ -20985,27 +21000,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "sygnalizacja świetlna"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "wysepka"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "nieoznakowane"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -21013,6 +21028,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -21021,11 +21036,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21033,30 +21048,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "znak stop"
@@ -21064,5 +21079,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -21071,14 +21086,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21086,33 +21101,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21120,5 +21135,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21126,5 +21141,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Miniaturowe rondo"
@@ -21135,14 +21150,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Kierunek"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "zgodnie z ruchem wskazówek zegara"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "miejsce do zawracania"
@@ -21152,5 +21167,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "granica miasta"
@@ -21158,15 +21173,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Edycja tablicy oznaczającej granicę miasta"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Druga nazwa"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "fotoradar"
@@ -21175,5 +21190,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Telefon alarmowy"
@@ -21181,5 +21196,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21187,5 +21202,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21193,5 +21208,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21201,10 +21216,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "bród"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Edycja brodu"
@@ -21212,5 +21227,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "przełęcz"
@@ -21218,5 +21233,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Edycja przełęczy"
@@ -21228,7 +21243,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Wysokość"
@@ -21236,5 +21251,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Przeszkody"
@@ -21242,5 +21257,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "słupek drogowy"
@@ -21248,5 +21263,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Edycja słupka drogowego"
@@ -21291,16 +21306,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21309,5 +21324,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21315,5 +21330,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "przeszkoda dla bydła"
@@ -21321,10 +21336,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Edycja przeszkody dla bydła"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21332,15 +21347,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Kolczatka"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Edycja kolczatki"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "punkt poboru opłat"
@@ -21348,5 +21363,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Edycja punktu poboru opłat"
@@ -21354,10 +21369,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "przejście graniczne"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Edycja przejścia granicznego"
@@ -21367,5 +21382,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "żywopłot"
@@ -21376,22 +21391,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "ogrodzenie"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "mur"
@@ -21399,5 +21414,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "mury miejskie"
@@ -21406,5 +21421,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "mur oporowy"
@@ -21416,10 +21431,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Wejście"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Edycja wejścia"
@@ -21427,5 +21442,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "brama"
@@ -21433,50 +21448,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Edycja bramy"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "przełaz"
@@ -21484,25 +21499,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Edycja przełazu"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21513,11 +21528,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "naturalny zbiornik wodny"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "źródło"
@@ -21525,5 +21540,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "plaża"
@@ -21531,5 +21546,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "odpływ"
@@ -21537,10 +21552,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Edycja odpływu"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "rów"
@@ -21548,10 +21563,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "strumień"
@@ -21559,10 +21574,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Edycja strumienia"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "kanał"
@@ -21570,10 +21585,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Edycja kanału"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "rzeka"
@@ -21583,5 +21598,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Edycja rzeki"
@@ -21589,15 +21604,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "ląd (wyspa)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Edycja lądu"
@@ -21605,15 +21620,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "zbiornik wodny"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Edycja zbiornika wodnego"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "sztuczne jezioro"
@@ -21621,15 +21636,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Edycja sztucznego jeziora"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21637,5 +21652,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -21644,10 +21659,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "mokradło"
@@ -21658,14 +21673,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Edycja mokradła"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "bagno"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "torfowisko"
@@ -21679,35 +21694,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "marsze"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "szuwary"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "tereny zalewowe"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "namorzyny"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "błota"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Edycja błot"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "plaża"
@@ -21715,20 +21730,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Edycja plaży"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "zatoka"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Edycja zatoki"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "klif"
@@ -21736,10 +21751,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Edycja klifu"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "wybrzeże"
@@ -21747,5 +21762,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Edycja zbiornika gazu"
@@ -21753,5 +21768,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "trasa promu"
@@ -21759,5 +21774,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Edycja trasy promu"
@@ -21766,5 +21781,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "stocznia"
@@ -21772,10 +21787,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Edycja stoczni"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "dok"
@@ -21783,5 +21798,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Edycja doku"
@@ -21789,5 +21804,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Tama"
@@ -21795,15 +21810,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Edycja tamy"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Punkty drogi wodnej"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "wrota śluzy"
@@ -21812,5 +21827,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "jaz"
@@ -21818,20 +21833,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Edycja jazu"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "wodospad"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Edycja wodospadu"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21840,15 +21855,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Edycja mariny"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "molo"
@@ -21856,10 +21871,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Edycja molo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "terminal promowy"
@@ -21867,10 +21882,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Edycja terminalu promowego"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "pochylnia"
@@ -21880,20 +21895,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Edycja pochylni"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Kolej"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "tor"
@@ -21901,5 +21916,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Edycja toru"
@@ -21929,86 +21944,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standardowy"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22020,8 +21960,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22035,29 +21975,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "dworzec przetokowy"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "bocznica"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "odnoga"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22070,8 +22010,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22142,8 +22082,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22155,8 +22095,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Napięcie"
@@ -22169,8 +22109,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22183,23 +22123,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "kolej wąskotorowa"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Edycja toru kolei wąskotorowej"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "tor jednoszynowy"
@@ -22207,50 +22147,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Edycja toru jednoszynowego"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "kolej retro"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Edycja kolei retro"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "trasa szybkiego tramwaju"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Edycja trasy szybkiego tramwaju"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Edycja toru metra"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "tramwaj"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Edycja torów tramwajowych"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22258,5 +22198,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22265,10 +22205,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "nieużywany tor"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Edycja opuszczonych torów"
@@ -22277,9 +22217,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Rodzaj (opcjonalne)"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "nieczynny tor"
@@ -22288,5 +22228,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "przejazd kolejowy"
@@ -22295,5 +22235,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "przejazd przez tory"
@@ -22303,5 +22243,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Rodzaj przejazdu"
@@ -22309,5 +22249,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "obrotnica"
@@ -22316,5 +22256,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22323,10 +22263,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Koleje linowe"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "wyciąg krzesełkowy"
@@ -22334,10 +22274,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Edycja wyciągu krzesełkowego"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "wyciąg orczykowy"
@@ -22345,10 +22285,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Edycja wyciągu orczykowego"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "kolej linowa"
@@ -22356,10 +22296,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Edycja kolei linowej"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22367,10 +22307,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22379,5 +22319,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22385,5 +22325,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22392,5 +22332,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22398,5 +22338,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "stacja benzynowa"
@@ -22406,62 +22346,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Edycja stacji benzynowej"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22519,32 +22459,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "godziny otwarcia"
@@ -22603,165 +22543,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22778,5 +22718,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22786,5 +22726,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Edycja parkingu"
@@ -22795,25 +22735,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Numer referencyjny"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "wielopoziomowy"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "powierzchnia"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podziemny"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22822,48 +22762,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Opłata"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Miejsca dla niepełnosprawnych"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Myjnia samochodowa"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Edycja myjni samochodowej"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr ""
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr ""
@@ -22871,5 +22811,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "wypożyczalnia"
@@ -22878,10 +22818,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Edycja wypożyczalni samochodów"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22889,5 +22829,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22895,10 +22835,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Edycja parkingu dla rowerów"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Pojemność"
@@ -22907,10 +22847,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Edycja wypożyczalni rowerów"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22920,5 +22860,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22926,5 +22866,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22932,5 +22872,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "przystanek kolejowy"
@@ -22938,5 +22878,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Edycja przystanku kolejowego"
@@ -22944,5 +22884,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "przystanek tramwajowy"
@@ -22951,5 +22891,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Edycja przystanku tramwajowego"
@@ -22957,5 +22897,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Platforma kolejowa"
@@ -22964,5 +22904,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Edytuj platformę kolejową"
@@ -22974,5 +22914,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Oznaczenie (numer toru)"
@@ -22980,10 +22920,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "obszar"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "wejście do metra"
@@ -22992,10 +22932,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Edycja wejścia do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "dla niepełnosprawnych"
@@ -23004,5 +22944,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "dworzec autobusowy"
@@ -23011,5 +22951,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Edycja dworca autobusowego"
@@ -23017,5 +22957,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Przystanek autobusowy"
@@ -23025,5 +22965,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Edycja przystanku autobusowego"
@@ -23032,6 +22972,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "schronienie"
@@ -23039,19 +22979,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "ławka"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "peron autobusowy"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Edycja peronu autobusowego"
@@ -23059,5 +22999,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "taksówki"
@@ -23065,5 +23005,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Edycja postoju taksówek"
@@ -23071,10 +23011,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "lotnisko"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23082,5 +23022,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23088,10 +23028,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23100,5 +23040,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23106,5 +23046,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23112,5 +23052,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23118,5 +23058,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23124,5 +23064,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23130,5 +23070,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23138,5 +23078,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23146,5 +23086,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23155,6 +23095,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "radiolatarnia"
@@ -23164,5 +23104,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23171,5 +23111,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23177,5 +23117,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23183,15 +23123,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Podróż"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Zakwaterowanie"
@@ -23203,5 +23143,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "hotel"
@@ -23210,15 +23150,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Edycja hotelu"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Gwiazdki"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "motel"
@@ -23226,20 +23166,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Edycja motelu"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "kwatera"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Edycja kwatery turystycznej"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "chata górska"
@@ -23247,10 +23187,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Edycja chaty górskiej"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "hostel"
@@ -23258,30 +23198,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Edycja hostelu"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "chata alpejska"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Edycja chaty alpejskiej"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "kemping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Edycja kempingu"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "pole namiotowe"
@@ -23289,10 +23229,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Edycja pola namiotowego"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Wyżywienie"
@@ -23303,5 +23243,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "restauracja"
@@ -23309,5 +23249,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Edycja restauracji"
@@ -23315,5 +23255,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Kuchnia"
@@ -23321,73 +23261,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "włoska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chińska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburgery"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "grecka"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "niemiecka"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indyjska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regionalna"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turecka"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "azjatycka"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "tajska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "meksykańska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japońska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "fast food"
@@ -23395,17 +23335,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Edycja restauracji fast-food"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "kawiarnia"
@@ -23413,9 +23353,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Edycja kawiarni"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "pub"
@@ -23423,18 +23363,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Edycja pubu"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "ogródek piwny"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Edycja ogródka piwnego"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "bar"
@@ -23442,9 +23382,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Edycja baru"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "klub nocny"
@@ -23452,24 +23392,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Edycja klubu nocnego"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turystyka"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "atrakcja"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Edycja atrakcji turystycznej"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "muzeum"
@@ -23477,9 +23417,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Edycja muzeum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "zoo"
@@ -23488,9 +23428,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Edycja zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "punkt widokowy"
@@ -23498,24 +23438,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Edycja punktu widokowego"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "wieża widokowa"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "park rozrywki"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Edycja parku rozrywki"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "sztuka"
@@ -23523,5 +23463,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Edycja obiektu sztuki"
@@ -23529,19 +23469,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23579,5 +23519,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23585,28 +23525,28 @@
 msgstr "ulica"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23616,5 +23556,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23622,5 +23562,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "szlak"
@@ -23628,6 +23568,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "kolarstwo"
@@ -23635,5 +23575,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23641,6 +23581,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "narciarstwo"
@@ -23648,5 +23588,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23654,46 +23594,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "tablica historyczna"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "tablica przyrodnicza"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "tablica o zwierzętach"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23701,29 +23641,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Edycja schronienia"
@@ -23731,25 +23671,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "miejsce na ognisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "miejsce na piknik"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Edycja miejsca na piknik"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Miejsca historyczne"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "zamek"
@@ -23758,19 +23698,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Edycja zamku"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "ruiny"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Edycja ruin"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Wykopaliska archeologiczne"
@@ -23779,9 +23719,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Edycja wykopalisk archeologicznych"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "pole bitwy"
@@ -23789,10 +23729,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Edycja pola bitwy"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23800,5 +23740,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23806,15 +23746,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "pomnik"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Edycja pomnika"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "miejsce pamięci"
@@ -23822,55 +23762,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Edycja miejsca pamięci"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "krzyż przydrożny"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Edycja krzyża przydrożnego"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "kapliczka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Edycja kapliczki"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "kamień graniczny"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Rozrywka"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "park wodny"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Edycja parku wodnego"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "plac zabaw"
@@ -23878,35 +23818,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Edycja placu zabaw"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "miejsce do wędkowania"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Edycja miejsca do wędkowania"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "obiekty sportowe"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Edycja stadionu"
@@ -23920,6 +23860,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "wybierz sport:"
@@ -24311,6 +24251,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24344,225 +24284,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "różne sporty"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "łucznictwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "lekkoatletyka"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "siatkówka"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "bule"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "gra w kule"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kajakarstwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "wspinaczka"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "krykiet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krokiet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "kolarstwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "wyścigi psów"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "jazda konna"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnastyka"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "wyścigi konne"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "sporty motorowe"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "strzelectwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "jazda na deskorolce"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "łyżwiarstwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "narciarstwo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "piłka nożna"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "pływanie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "tenis stołowy"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "centrum sportowe"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Edycja centrum sportowego"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "boisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Edycja boiska"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "tor wyścigowy"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Edycja toru wyścigowego"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "pole golfowe"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Edycja pola golfowego"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "miniaturowy golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Edycja miniaturowego golfa"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "różne sporty"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24601,21 +24541,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "rodzaj"
@@ -24654,203 +24594,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "boisko"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "centrum sportowe"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "kręgle"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Edycja kręgli"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "lekkoatletyka"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Edycja"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "łucznictwo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr ""
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "wspinaczka"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr ""
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "kajakarstwo"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr ""
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr ""
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "wyścigi psów"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr ""
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "jeździectwo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "wyścigi konne"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr ""
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "gimnastyka"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "sporty motorowe"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr ""
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "łyżwiarstwo"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr ""
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "jazda na deskorolce"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "pływanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr ""
@@ -24858,52 +24798,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Rodzaj trasy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Poziom trudności"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "dla początkujących"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "łatwa"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "dla ekspertów"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "strzelectwo"
@@ -24911,177 +24851,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr ""
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Sporty z piłką"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "piłka nożna"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr ""
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "football"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr ""
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "australijski football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr ""
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "koszykówka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr ""
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr ""
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "pole golfowe"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "bule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Edycja boiska do gry w boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "gra w kule"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "krykiet"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Edycja boiska do gry w krykieta"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "krykiet - siatki"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Edycja siatek do treningu gry w krykieta"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "krokiet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Edycja miejsca do gry w krokieta"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Edycja miejsca do gry w hokeja"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Edycja miejsca do gry w pelotę"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Edycja miejsca do gry w rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "tenis stołowy"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Edycja miejsca do gry w tenis stołowy"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Edycja miejsca do gry w tenisa"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "budynek"
@@ -25089,5 +25029,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "budynek użyteczności publicznej"
@@ -25095,10 +25035,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Edycja budynku użyteczności publicznej"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "ratusz"
@@ -25106,10 +25046,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Edycja ratusza"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "ambasada"
@@ -25117,10 +25057,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Edycja ambasady"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "sąd"
@@ -25129,10 +25069,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Edycja siedziby sądu"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "więzienie"
@@ -25141,10 +25081,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Edycja więzienia"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "posterunek policji"
@@ -25154,10 +25094,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Edycja posterunku policji"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "straż pożarna"
@@ -25166,10 +25106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Edycja posterunku straży pożarnej"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "poczta"
@@ -25177,5 +25117,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Edycja urzędu pocztowego"
@@ -25183,15 +25123,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "przedszkole"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Edycja przedszkola"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "szkoła"
@@ -25199,10 +25139,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Edycja szkoły"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "uniwersytet"
@@ -25210,10 +25150,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Edycja uniwersytetu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "college"
@@ -25221,5 +25161,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Edycja college'u"
@@ -25227,5 +25167,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "kino"
@@ -25234,10 +25174,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Edycja kina"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "biblioteka"
@@ -25246,9 +25186,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Edycja biblioteki"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "centrum kulturalne"
@@ -25256,10 +25196,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Edycja centrum kulturalnego"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "teatr"
@@ -25268,10 +25208,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Edycja teatru"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "miejsce kultu religijnego"
@@ -25281,5 +25221,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Edycja miejsca kultu religijnego"
@@ -25288,6 +25228,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religia"
@@ -25296,66 +25236,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahaizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddyzm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "chrześcijaństwo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "dżinizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judaizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikhizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spirytualizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoizm"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zaratusztrianizm"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Wyznanie"
@@ -25364,81 +25304,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "kościół anglikański"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptyści"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "kościół katolicki"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "ewangelikalizm"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "świadkowie Jehowy"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luteranie"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodyści"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormoni"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "kościół prawosławny"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "zielonoświątkowcy"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "prezbiterianie"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestanci"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "kwakrzy"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "szyici"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnici"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -25447,5 +25387,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Edycja informacji o adresach"
@@ -25453,5 +25393,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Numer domu"
@@ -25459,25 +25399,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nazwa domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nazwa ulicy"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Nazwa miejscowości"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Kod pocztowy"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kod kraju"
@@ -25486,5 +25426,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Edycja interpolacji adresów"
@@ -25492,61 +25432,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Sposób numeracji domów"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "nieparzyste"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "parzyste"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Obiekty sztuczne"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "zakład produkcyjny"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Edycja zakładu produkcyjnego"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "wieża"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Edycja wieży"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25554,25 +25494,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "wieża ciśnień"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Edycja wieży ciśnień"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "zbiornik gazu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Edycja zbiornika gazu"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "latarnia morska"
@@ -25580,10 +25520,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Edycja latarni morskiej"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "wiatrak"
@@ -25591,10 +25531,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Edycja wiatraka"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "rurociąg"
@@ -25603,41 +25543,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Edycja rurociągu"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "gazowa"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "oczyszczalnia ścieków"
@@ -25647,10 +25587,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Edycja oczyszczalni ścieków"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "dźwig"
@@ -25658,5 +25598,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Edycja dźwigu"
@@ -25664,10 +25604,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Edycja radiolatarni"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "punkt geodezyjny"
@@ -25675,10 +25615,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Edycja punktu geodezyjnego"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "monitoring"
@@ -25686,23 +25626,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Edycja kamery do monitoringu"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "źródło energii elektrycznej"
@@ -25712,35 +25652,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Edycja źródła energii elektrycznej"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "wiatrowa"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "wodna"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "cieplna"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "jądrowa"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "węglowa"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "fotowoltaiczna"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "elektrownia"
@@ -25749,10 +25689,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Edycja elektrowni"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "rozdzielnia elektryczna"
@@ -25761,5 +25701,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Edycja rozdzielni elektrycznej"
@@ -25767,10 +25707,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "oznaczenie linii"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "słup elektryczny"
@@ -25781,23 +25721,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Edycja słupa linii wysokiego napięcia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "linia wysokiego napięcia"
@@ -25806,74 +25746,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Edycja linii wysokiego napięcia"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "udogodnienia (amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "toalety"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Uwagi"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "skrzynka pocztowa"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "telefon"
@@ -25882,5 +25822,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Edycja telefonu"
@@ -25888,5 +25828,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "na monety"
@@ -25894,5 +25834,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "na banknoty"
@@ -25900,5 +25840,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "na karty chipowe"
@@ -25906,5 +25846,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "na karty debetowe"
@@ -25912,15 +25852,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "na karty kredytowe"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "na karty telefoniczne"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "zbiórka odpadów"
@@ -25929,5 +25869,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Edycja punktu zbiórki odpadów"
@@ -25935,35 +25875,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "baterie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "puszki"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "odzież"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "szkło"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "złom"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25971,5 +25911,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25978,31 +25918,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "kamień"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26081,5 +26021,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26089,31 +26029,31 @@
 msgstr "zielony"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Ambona myśliwska"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Edycja ambony strzelniczej"
@@ -26122,30 +26062,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Wysokość"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Ukryj"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Zablokuj"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "fontanna"
@@ -26154,10 +26094,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Edycja fontanny"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "woda do picia"
@@ -26166,10 +26106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Edycja punktu z wodą pitną"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26178,5 +26118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26184,5 +26124,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26190,15 +26130,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Sklepy"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26206,10 +26146,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Edycja warsztatu samochodowego"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26218,28 +26158,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Edycja warsztatu rowerowego"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Edycja supermarketu"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "sklepik"
@@ -26247,9 +26187,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Edycja sklepiku"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "kiosk"
@@ -26257,27 +26197,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Edycja kiosku"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "rzeźnik"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Edycja sklepu mięsnego"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "piekarnia"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Edycja piekarni"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "florysta"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Edycja kwiaciarni"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "naturalna żywność"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Edycja sklepu z naturalną żywnością"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "monopolowy"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "napoje"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Komputer"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Edycja sklepu komputerowego"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Edycja sklepu z elektroniką"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "sprzęt hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Edycja sklepu ze sprzętem hi-fi"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "meble"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Edycja sklepu meblowego"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "centrum ogrodnicze"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Edycja centrum ogrodniczego"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "sklep DIY"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Edycja sklepu DIY (zrób to sam)"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "artykuły biurowe"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Edycja sklepu z artykułami biurowymi"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "fryzjer"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Edycja salonu fryzjerskiego"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "obuwie"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Edycja sklepu obuwniczego"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "zabawki"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Edycja sklepu z zabawkami"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "pralnia chemiczna"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Edycja palni chemicznej"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "pralnia samoobsługowa"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "wyspa"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "sklep turystyczny"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Edycja sklepu ze sprzętem turystycznym"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Edycja sklepu sportowego"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Edycja optyka"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "automat sprzedający"
@@ -26285,5 +26439,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Edycja automatu sprzedającego"
@@ -26291,306 +26445,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Sprzedawane produkty"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "bilety komunikacji miejskiej"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "mapy komunikacji miejskiej"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "bilety parkingowe"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "jedzenie"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "napoje"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "słodycze"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "papierosy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "zdjęcia"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "jedzenie dla zwierząt"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "gazety"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "zabawki"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "znaczki"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "karty SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "vouchery"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "mapa tras rowerowych"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "prezerwatywy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampony"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "torby na odchody"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "rzeźnik"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Edycja sklepu mięsnego"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "piekarnia"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Edycja piekarni"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "florysta"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Edycja kwiaciarni"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "naturalna żywność"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Edycja sklepu z naturalną żywnością"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "monopolowy"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "napoje"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Komputer"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Edycja sklepu komputerowego"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Edycja sklepu z elektroniką"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "sprzęt hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Edycja sklepu ze sprzętem hi-fi"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "meble"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Edycja sklepu meblowego"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "centrum ogrodnicze"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Edycja centrum ogrodniczego"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "sklep DIY"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Edycja sklepu DIY (zrób to sam)"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "artykuły biurowe"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Edycja sklepu z artykułami biurowymi"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "fryzjer"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Edycja salonu fryzjerskiego"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "obuwie"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Edycja sklepu obuwniczego"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "zabawki"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Edycja sklepu z zabawkami"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "pralnia chemiczna"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Edycja palni chemicznej"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "pralnia samoobsługowa"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "wyspa"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "sklep turystyczny"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Edycja sklepu ze sprzętem turystycznym"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Edycja sklepu sportowego"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Edycja optyka"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Gotówka"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "bank"
@@ -26598,14 +26544,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Edycja banku"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "kantor"
@@ -26613,5 +26559,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Edycja kantoru"
@@ -26619,15 +26565,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Edycja bankomatu"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Zdrowie"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "lekarz"
@@ -26635,18 +26581,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Edycja lekarza"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "dentysta"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Edycja dentysty"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "apteka"
@@ -26654,5 +26600,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Edycja apteki"
@@ -26660,9 +26606,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "realizacja recept"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "szpital"
@@ -26670,10 +26616,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Edycja szpitala"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26682,5 +26628,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26689,20 +26635,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Numer punktu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Numer telefonu"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Podaj razem z kodem kraju, np.: +12-345-67890)"
@@ -26710,5 +26656,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "weterynarz"
@@ -26717,64 +26663,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Edycja lecznicy weterynaryjnej"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Miejsca"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "kontynent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Edycja kontynentu"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "kraj"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Edycja kraju"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "stan"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Edycja stanu"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Edycja regionu"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "okręg"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Edycja okręgu / hrabstwa"
@@ -26782,15 +26728,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "miasto"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Edycja miasta"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "miejscowość"
@@ -26798,10 +26744,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Edycja miejscowości"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "dzielnica"
@@ -26809,25 +26755,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Edycja dzielnicy"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "wieś"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Edycja wsi"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "przysiółek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Edycja wólki"
@@ -26835,5 +26781,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "okolica"
@@ -26841,10 +26787,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Edycja okolicy"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "wyspa"
@@ -26852,10 +26798,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Edycja wyspy"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26863,5 +26809,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26869,5 +26815,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "wejście do jaskini"
@@ -26875,10 +26821,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Edycja wejścia do jaskini"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "wzgórze"
@@ -26886,10 +26832,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Edycja wzgórza"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "lodowiec"
@@ -26897,10 +26843,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Edycja lodowca"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "wulkan"
@@ -26908,70 +26854,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Edycja wulkanu"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Granice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "narodowa"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Edycja granicy narodowej"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "administracyjna"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Edycja granicy administracyjnej"
 
 #. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
+#: build/trans_presets.java:2946
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
 msgid "Edit Political Boundary"
 msgstr "Edycja granicy politycznej"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "park narodowy"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Edycja granicy parku narodowego"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Zagospodarowanie terenu"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "drzewo"
@@ -26980,15 +26926,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Edycja drzewa"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Nazwa systematyczna"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "las"
@@ -26997,5 +26943,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Edycja lasu"
@@ -27003,17 +26949,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "iglasty"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "liściasty"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "mieszany"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "las"
@@ -27022,14 +26968,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Edycja lasu"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "rezerwat przyrody"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Edycja rezerwatu przyrody"
@@ -27037,25 +26983,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "rumowisko"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Edycja rumowiska"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "busz"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Edycja buszu"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "turnia"
@@ -27063,10 +27009,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Edycja turni"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "wrzosowisko"
@@ -27074,5 +27020,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Edycja wrzosowiska"
@@ -27080,5 +27026,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "zagroda"
@@ -27087,45 +27033,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Edycja zagrody"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "grunty rolne"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Edycja gruntów rolnych"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "łąka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Edycja łąki"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "winnica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Edycja winnicy"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "ogródki działkowe"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Edycja ogródków działkowych"
@@ -27133,25 +27079,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "ogród"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Edycja ogrodu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Trawa"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "zieleń miejska"
@@ -27159,10 +27105,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "miejsce publiczne"
@@ -27170,20 +27116,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Edycja miejsca publicznego"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Edycja parku"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Teren rekreacyjny"
@@ -27191,5 +27137,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Edycja terenu rekreacyjnego"
@@ -27197,15 +27143,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "zabudowa mieszkaniowa"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Edycja zabudowy mieszkaniowej"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "cmentarz"
@@ -27213,9 +27159,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "cmentarz"
@@ -27223,39 +27169,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Edycja cmentarza"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "handel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Edycja obszaru handlowego"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "biura i usługi"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Edycja obszaru biur i usług"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "teren przemysłowy"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Edycja terenu przemysłowego"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "teren kolejowy"
@@ -27263,15 +27209,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Edycja terenu kolejowego"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "obszar wojskowy"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Edycja obszaru wojskowego"
@@ -27279,50 +27225,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "budowa"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Edycja terenu budowy"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr ""
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr ""
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "teren pod zabudowę"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Edycja terenu pod zabudowę"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "wysypisko"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Edycja wysypiska śmieci"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "kamieniołom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Edycja komieniołomu"
@@ -27332,5 +27278,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27339,10 +27285,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "zewnętrzny segment"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "wewnętrzny segment"
@@ -27350,5 +27296,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "ograniczenia skrętu"
@@ -27357,5 +27303,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Edycja ograniczenia skrętu"
@@ -27363,34 +27309,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Ograniczenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "brak skrętu w lewo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "brak skrętu w prawo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "zakaz jazdy prosto"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "zakaz zawracania"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "nakaz skrętu w prawo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "nakaz skrętu w lewo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "nakaz jazdy prosto"
@@ -27399,15 +27345,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "z drogi"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "przez węzeł lub drogę"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "do drogi"
@@ -27415,5 +27361,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Trasa"
@@ -27422,5 +27368,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Edytuj trasę"
@@ -27428,5 +27374,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Typ trasy"
@@ -27517,5 +27463,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27525,17 +27471,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "droga"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "prom"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27595,5 +27541,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27602,9 +27548,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "tramway"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "objazd"
@@ -27618,10 +27564,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Opis symboli"
@@ -27629,31 +27575,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Sieć"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "proponowany"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternatywny"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "tymczasowy"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "połaczenie"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Kolor (hex)"
@@ -27662,32 +27608,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standardowy"
 
 #. mappaint style named "standard"
@@ -31649,10 +31670,10 @@
 #: build/trans_wms.java:27
 msgid "Czech CUZK:KM"
-msgstr ""
+msgstr "Czechy CUZK:KM"
 
 #. http://wms.cuzk.cz/wms.asp?service=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=kn,def_budovy,prehledky&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:28
 msgid "Czech UHUL:ORTOFOTO"
-msgstr ""
+msgstr "Czechy UHUL:ORTOFOTO"
 
 #. http://geoportal2.uhul.cz/cgi-bin/oprl.asp?SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Ortofoto_cb&STYLES=default&FORMAT=image/jpeg&TRANSPARENT=TRUE&
@@ -31704,10 +31725,10 @@
 #: build/trans_wms.java:46
 msgid "Lodi - Italy"
-msgstr ""
+msgstr "Lodi - Włochy"
 
 #. http://sit.provincia.lodi.it/mapserver/mapserv.exe?map=ortofoto_wgs84.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&SRS=EPSG:4326&LAYERS=Terraitaly%20Ortofoto%202007&STYLES=%2C%2C&FORMAT=image/png&TRANSPARENT=TRUE&
 #: build/trans_wms.java:47
 msgid "Sicily - Italy"
-msgstr ""
+msgstr "Sycylia - Włochy"
 
 #~ msgid "Move"
@@ -32180,7 +32201,4 @@
 #~ msgstr "mapa tras pieszych"
 
-#~ msgid "bicyclemap"
-#~ msgstr "mapa tras rowerowych"
-
 #~ msgid "Validate either current selection or complete dataset."
 #~ msgstr "Weryfikuje bieżące zaznaczenie lub całość danych."
Index: /applications/editors/josm/i18n/po/pt_BR.po
===================================================================
--- /applications/editors/josm/i18n/po/pt_BR.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/pt_BR.po	(revision 20945)
@@ -8,7 +8,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-08 14:50+0000\n"
-"Last-Translator: Rodrigo de Avila <rodrigo@avila.net.br>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-20 19:11+0100\n"
+"Last-Translator: bastik\n"
 "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:47+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -98,6 +98,5 @@
 #: ../core/src/org/openstreetmap/josm/Main.java:444
 msgid "Parameter \"downloadgps\" does not accept file names or file URLs"
-msgstr ""
-"Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos."
+msgstr "Parâmetro \"downloadgps\" não aceita nomes de arquivos ou URLs de arquivos."
 
 #: ../core/src/org/openstreetmap/josm/Main.java:512
@@ -190,31 +189,16 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:44
 #, java-format
-msgid ""
-"WARNING: unexpected format of API base URL. Redirection to info or history "
-"page for OSM primitive will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Aviso: formato inesperado da URL base da API. Redireccionar para a "
-"informação ou para a página do histórico do OSM primitivo vai, "
-"provavelmente, falhar. A URL base da API é: \"{0}\""
+msgid "WARNING: unexpected format of API base URL. Redirection to info or history page for OSM primitive will probably fail. API base URL is: ''{0}''"
+msgstr "Aviso: formato inesperado da URL base da API. Redireccionar para a informação ou para a página do histórico do OSM primitivo vai, provavelmente, falhar. A URL base da API é: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:63
 #, java-format
-msgid ""
-"WARNING: unexpected format of API base URL. Redirection to user page for OSM "
-"user will probably fail. API base URL is: ''{0}''"
-msgstr ""
-"Aviso: formato inesperado da URL base da API. Redireccionar para a página do "
-"usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: \"{0}"
-"\""
+msgid "WARNING: unexpected format of API base URL. Redirection to user page for OSM user will probably fail. API base URL is: ''{0}''"
+msgstr "Aviso: formato inesperado da URL base da API. Redireccionar para a página do usuário para o seu OSM vai, provavelmente, falhar. A URL base da API é: \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:86
 #, java-format
-msgid ""
-"You are about to launch {0} browser windows.<br>This may both clutter your "
-"screen with browser windows<br>and take some time to finish."
-msgstr ""
-"Você está prestes a abrir {0} janelas do navegador.<br>Isso pode tanto "
-"atravancar sua tela com janelas do navegador<br>quanto levar algum tempo "
-"para terminar."
+msgid "You are about to launch {0} browser windows.<br>This may both clutter your screen with browser windows<br>and take some time to finish."
+msgstr "Você está prestes a abrir {0} janelas do navegador.<br>Isso pode tanto atravancar sua tela com janelas do navegador<br>quanto levar algum tempo para terminar."
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:92
@@ -316,10 +300,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:80
 #, java-format
-msgid ""
-"<html>There are no layers the source layer<br>''{0}''<br>could be merged to."
-"</html>"
-msgstr ""
-"<html>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</"
-"html>"
+msgid "<html>There are no layers the source layer<br>''{0}''<br>could be merged to.</html>"
+msgstr "<html>Não há camadas em que a camada<br>''{0}''<br>possa ser combinada.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/AbstractMergeAction.java:81
@@ -647,18 +627,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:59
-msgid ""
-"The ways can not be combined in their current directions.  Do you want to "
-"reverse some of them?"
-msgstr ""
-"Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter "
-"algum destes?"
+msgid "The ways can not be combined in their current directions.  Do you want to reverse some of them?"
+msgstr "Os caminhos não podem ser combinados nas direções atuais. Pretendes inverter algum destes?"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:66
-msgid ""
-"Could not combine ways (They could not be merged into a single string of "
-"nodes)"
-msgstr ""
-"No foi possível combinar os caminhos (Eles podem não estar unidos em um "
-"único conjunto de nós)"
+msgid "Could not combine ways (They could not be merged into a single string of nodes)"
+msgstr "No foi possível combinar os caminhos (Eles podem não estar unidos em um único conjunto de nós)"
 
 #: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:219
@@ -702,10 +674,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:265
-msgid ""
-"Please select exactly two or three nodes or one way with exactly two or "
-"three nodes."
-msgstr ""
-"Por favor, selecione dois ou três nós ou uma via com exatamente dois ou três "
-"nós."
+msgid "Please select exactly two or three nodes or one way with exactly two or three nodes."
+msgstr "Por favor, selecione dois ou três nós ou uma via com exatamente dois ou três nós."
 
 #: ../core/src/org/openstreetmap/josm/actions/DeleteAction.java:18
@@ -798,6 +766,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47
 msgid "Select if the referrers of the object should be downloaded as well"
-msgstr ""
-"Selecione se os objetos que se referem a esse também devem ser baixados"
+msgstr "Selecione se os objetos que se referem a esse também devem ser baixados"
 
 #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55
@@ -838,6 +805,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java:29
 msgid "Download primitives referring to one of the selected primitives"
-msgstr ""
-"Descarregamento primitivas referenciadas a uma das primitivas selecionadas"
+msgstr "Descarregamento primitivas referenciadas a uma das primitivas selecionadas"
 
 #: ../core/src/org/openstreetmap/josm/actions/DuplicateAction.java:19
@@ -932,6 +898,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:17
 msgid "Display history information about OSM ways, nodes, or relations."
-msgstr ""
-"Mostrar informações de histórico sobre caminhos, nós ou relações do OSM."
+msgstr "Mostrar informações de histórico sobre caminhos, nós ou relações do OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
@@ -968,6 +933,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:80
 msgid "The selected way has nodes outside of the downloaded data region."
-msgid_plural ""
-"The selected ways have nodes outside of the downloaded data region."
+msgid_plural "The selected ways have nodes outside of the downloaded data region."
 msgstr[0] "A via selecionada tem nós fora da área de download definida."
 msgstr[1] "As vias selecionadas tem nós fora da área de download definida."
@@ -1011,10 +975,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235
-msgid ""
-"Some of the ways were part of relations that have been modified. Please "
-"verify no errors have been introduced."
-msgstr ""
-"Algumas das vias são parte de relações que foram modificadas. Por favor, "
-"verifique se não foram introduzidos erros."
+msgid "Some of the ways were part of relations that have been modified. Please verify no errors have been introduced."
+msgstr "Algumas das vias são parte de relações que foram modificadas. Por favor, verifique se não foram introduzidos erros."
 
 #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:297
@@ -1139,9 +1099,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:168
 #, java-format
-msgid ""
-"Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
-msgstr ""
-"Impossível mesclar nós: seria necessário apagar via \"{0}\" que ainda é "
-"usada."
+msgid "Cannot merge nodes: Would have to delete way ''{0}'' which is still used."
+msgstr "Impossível mesclar nós: seria necessário apagar via \"{0}\" que ainda é usada."
 
 #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:269
@@ -1209,5 +1166,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Não é possível mover objetos para fora do planeta."
@@ -1242,27 +1199,18 @@
 msgid "Cannot open {0} file with the file importer ''{1}''."
 msgid_plural "Cannot open {0} files with the file importer ''{1}''."
-msgstr[0] ""
-"Não foi possível abrir {0} arquivo com o importador de arquivos ''{1}''."
-msgstr[1] ""
-"Não foi possível abrir {0} arquivos com o importador de arquivos ''{1}''."
+msgstr[0] "Não foi possível abrir {0} arquivo com o importador de arquivos ''{1}''."
+msgstr[1] "Não foi possível abrir {0} arquivos com o importador de arquivos ''{1}''."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132
 #, java-format
 msgid "Cannot open {0} file because no suitable file importer is available."
-msgid_plural ""
-"Cannot open {0} files because no suitable file importer is available."
-msgstr[0] ""
-"Não foi possível abrir {0} arquivo porque não foi encontrado importador de "
-"arquivos adequado."
-msgstr[1] ""
-"Não foi possível abrir {0} arquivos porque não foi encontrado importador de "
-"arquivos adequado."
+msgid_plural "Cannot open {0} files because no suitable file importer is available."
+msgstr[0] "Não foi possível abrir {0} arquivo porque não foi encontrado importador de arquivos adequado."
+msgstr[1] "Não foi possível abrir {0} arquivos porque não foi encontrado importador de arquivos adequado."
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189
 #, java-format
 msgid "<html>Cannot open directory ''{0}''.<br>Please select a file.</html>"
-msgstr ""
-"<html>Não foi possível abrir o diretório ''{0}''.<br>Por favor escolha um "
-"arquivo.</html>"
+msgstr "<html>Não foi possível abrir o diretório ''{0}''.<br>Por favor escolha um arquivo.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:190
@@ -1320,17 +1268,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:39
-msgid ""
-"<h3>When one or more ways are selected, the shape is adjusted such, that all "
-"angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. "
-"Then, the direction is fixed by these two reference nodes. (Afterwards, you "
-"can undo the movement for certain nodes:<br>Select them and press the "
-"shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
-msgstr ""
-"<h3> Quando uma ou mais vias são selecionadas, a forma é ajustada para que "
-"todos os ângulos tenham 90 ou 180 graus.</h3>Você pode adicionar dois nós "
-"para a seleção. Então, a direção é fixada usando este dois nós de "
-"referência. (Posteriormente você pode desfazer o movimento para alguns nós: "
-"<br>Selecione-os e pressione o atalho para Ortogonalizar / Desfazer. O "
-"padrão é Shift-Q.)"
+msgid "<h3>When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.</h3>You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes. (Afterwards, you can undo the movement for certain nodes:<br>Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)"
+msgstr "<h3> Quando uma ou mais vias são selecionadas, a forma é ajustada para que todos os ângulos tenham 90 ou 180 graus.</h3>Você pode adicionar dois nós para a seleção. Então, a direção é fixada usando este dois nós de referência. (Posteriormente você pode desfazer o movimento para alguns nós: <br>Selecione-os e pressione o atalho para Ortogonalizar / Desfazer. O padrão é Shift-Q.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:45
@@ -1360,10 +1297,8 @@
 msgid ""
 "Orthogonalize Shape / Undo\n"
-"Please select nodes that were moved by the previous Orthogonalize Shape "
-"action!"
+"Please select nodes that were moved by the previous Orthogonalize Shape action!"
 msgstr ""
 "Ortogonalizar Forma / Desfazer\n"
-"Por favor selecione os nós que foram movidos pela última chamada à função "
-"Ortogonalizar Forma!"
+"Por favor selecione os nós que foram movidos pela última chamada à função Ortogonalizar Forma!"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110
@@ -1372,12 +1307,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:120
-msgid ""
-"<html>You are using the EPSG:4326 projection which might lead<br>to "
-"undesirable results when doing rectangular alignments.<br>Change your "
-"projection to get rid of this warning.<br>Do you want to continue?</html>"
-msgstr ""
-"<html>Você está usando a EPSG: 4326 projeção que poderá conduzir a "
-"resultados indesejáveis quando <br> fazendo alinhamnentos retangular . <br> "
-"Mude sua projeção para se livrar do presente aviso. <br> Quer continuar?"
+msgid "<html>You are using the EPSG:4326 projection which might lead<br>to undesirable results when doing rectangular alignments.<br>Change your projection to get rid of this warning.<br>Do you want to continue?</html>"
+msgstr "<html>Você está usando a EPSG: 4326 projeção que poderá conduzir a resultados indesejáveis quando <br> fazendo alinhamnentos retangular . <br> Mude sua projeção para se livrar do presente aviso. <br> Quer continuar?"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148
@@ -1399,15 +1328,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:264
-msgid ""
-"<html>Please make sure all selected ways head in a similar direction<br>or "
-"orthogonalize them one by one.</html>"
-msgstr ""
-"<html>Por favor, tenha certeza de que todas as vias selecionadas apontam na "
-"mesma direção<br>ou ortogonalize-as uma por uma</html>"
+msgid "<html>Please make sure all selected ways head in a similar direction<br>or orthogonalize them one by one.</html>"
+msgstr "<html>Por favor, tenha certeza de que todas as vias selecionadas apontam na mesma direção<br>ou ortogonalize-as uma por uma</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417
 msgid "Please select ways with angles of approximately 90 or 180 degrees."
-msgstr ""
-"Por favor selecione vias com ângulos de aproximadamente 90 ou 180 graus."
+msgstr "Por favor selecione vias com ângulos de aproximadamente 90 ou 180 graus."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:32
@@ -1434,11 +1358,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteAction.java:154
-msgid ""
-"The copied data contains incomplete primitives.  When pasting the incomplete "
-"primitives are removed.  Do you want to paste the data without the "
-"incomplete primitives?"
-msgstr ""
-"Os dados copiados contem primitivas incompletas. Ao colar se apagarão as "
-"primitivas incompletas. Deseja colar os dados sem as primitivas incompletas?"
+msgid "The copied data contains incomplete primitives.  When pasting the incomplete primitives are removed.  Do you want to paste the data without the incomplete primitives?"
+msgstr "Os dados copiados contem primitivas incompletas. Ao colar se apagarão as primitivas incompletas. Deseja colar os dados sem as primitivas incompletas?"
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:32
@@ -1449,7 +1368,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:33
 msgid "Apply tags of contents of paste buffer to all selected items."
-msgstr ""
-"Aplicar tags de conteúdo da memória de transferência em todos itens "
-"selecionados."
+msgstr "Aplicar tags de conteúdo da memória de transferência em todos itens selecionados."
 
 #: ../core/src/org/openstreetmap/josm/actions/PasteTagsAction.java:109
@@ -1547,5 +1464,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -1626,10 +1543,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:115
-msgid ""
-"There are unresolved conflicts. Conflicts will not be saved and handled as "
-"if you rejected all. Continue?"
-msgstr ""
-"Existem conflitos não resolvidos. Os conflitos não serão salvos e tratados "
-"se você rejeitar todos. Continuar?"
+msgid "There are unresolved conflicts. Conflicts will not be saved and handled as if you rejected all. Continue?"
+msgstr "Existem conflitos não resolvidos. Os conflitos não serão salvos e tratados se você rejeitar todos. Continuar?"
 
 #: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:126
@@ -1662,10 +1575,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SelectAllAction.java:15
-msgid ""
-"Select all undeleted objects in the data layer. This selects incomplete "
-"objects too."
-msgstr ""
-"Selecionar todos objetos não deletados na camada de dados. Isso seleciona "
-"objetos incompletos também."
+msgid "Select all undeleted objects in the data layer. This selects incomplete objects too."
+msgstr "Selecionar todos objetos não deletados na camada de dados. Isso seleciona objetos incompletos também."
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:39
@@ -1676,6 +1585,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:41
 msgid "Show status report with useful information that can be attached to bugs"
-msgstr ""
-"Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
+msgstr "Mostrar relatório atual com informações úteis que podem ser anexadas aos bugs"
 
 #: ../core/src/org/openstreetmap/josm/actions/ShowStatusReportAction.java:42
@@ -1753,6 +1661,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126
 #, java-format
-msgid ""
-"The selection contains {0} ways. Are you sure you want to simplify them all?"
+msgid "The selection contains {0} ways. Are you sure you want to simplify them all?"
 msgstr "A seleção contém {0} vias. Está seguro que quer simplicá-las?"
 
@@ -1795,16 +1702,8 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:156
-msgid ""
-"There is more than one way using the node you selected. Please select the "
-"way also."
-msgid_plural ""
-"There is more than one way using the nodes you selected. Please select the "
-"way also."
-msgstr[0] ""
-"Há mais de um caminho usando o nó que foi selecionado. Favor selecionar o "
-"caminho também."
-msgstr[1] ""
-"Há mais de um caminho usando os nós que foram selecionados. Favor selecionar "
-"o caminho também."
+msgid "There is more than one way using the node you selected. Please select the way also."
+msgid_plural "There is more than one way using the nodes you selected. Please select the way also."
+msgstr[0] "Há mais de um caminho usando o nó que foi selecionado. Favor selecionar o caminho também."
+msgstr[1] "Há mais de um caminho usando os nós que foram selecionados. Favor selecionar o caminho também."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:169
@@ -1821,30 +1720,17 @@
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:281
 msgid "You must select two or more nodes to split a circular way."
-msgstr ""
-"Você precisa selecionar dois ou mais nós para dividir um caminho circular."
+msgstr "Você precisa selecionar dois ou mais nós para dividir um caminho circular."
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:287
-msgid ""
-"The way cannot be split at the selected nodes. (Hint: Select nodes in the "
-"middle of the way.)"
-msgstr ""
-"O caminho não pode ser dividido nos nós selecionados. (Dica: Selecione nós "
-"no meio do caminho.)"
+msgid "The way cannot be split at the selected nodes. (Hint: Select nodes in the middle of the way.)"
+msgstr "O caminho não pode ser dividido nos nós selecionados. (Dica: Selecione nós no meio do caminho.)"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:460
-msgid ""
-"<html>A role based relation membership was copied to all new ways.<br>You "
-"should verify this and correct it when necessary.</html>"
-msgstr ""
-"<html>Um papel baseado na composição da relação foi copiado para todos os "
-"caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
+msgid "<html>A role based relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"
+msgstr "<html>Um papel baseado na composição da relação foi copiado para todos os caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:466
-msgid ""
-"<html>A relation membership was copied to all new ways.<br>You should verify "
-"this and correct it when necessary.</html>"
-msgstr ""
-"<html>Uma composição de relação foi copiada para todos os caminhos novos."
-"<br>Deverá verificar isto e corrigir quando necessário.</html>"
+msgid "<html>A relation membership was copied to all new ways.<br>You should verify this and correct it when necessary.</html>"
+msgstr "<html>Uma composição de relação foi copiada para todos os caminhos novos.<br>Deverá verificar isto e corrigir quando necessário.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:473
@@ -1909,26 +1795,19 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:121
-msgid ""
-"* One way that has one or more nodes that are used by more than one way, or"
-msgstr ""
-"* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou"
+msgid "* One way that has one or more nodes that are used by more than one way, or"
+msgstr "* Um caminho que tem um ou mais nós que é usado por mais de um caminho, ou"
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:122
-msgid ""
-"* One way and one or more of its nodes that are used by more than one way."
-msgstr ""
-"* Um caminho e um ou mais de seus nós que são usados por mais de um caminho."
+msgid "* One way and one or more of its nodes that are used by more than one way."
+msgstr "* Um caminho e um ou mais de seus nós que são usados por mais de um caminho."
 
 #: ../core/src/org/openstreetmap/josm/actions/UnGlueAction.java:124
 msgid ""
 "Note: If a way is selected, this way will get fresh copies of the unglued\n"
-"nodes and the new nodes will be selected. Otherwise, all ways will get "
-"their\n"
+"nodes and the new nodes will be selected. Otherwise, all ways will get their\n"
 "own copy and all nodes will be selected."
 msgstr ""
-"Nota: Se um caminho é selecionado, este caminho receberá cópias recentes dos "
-"nós não grudados\n"
-"e os nós novos estarão selecionados. Caso contrário, todos os caminhos terão "
-"sua própria\n"
+"Nota: Se um caminho é selecionado, este caminho receberá cópias recentes dos nós não grudados\n"
+"e os nós novos estarão selecionados. Caso contrário, todos os caminhos terão sua própria\n"
 "cópia e todos os nós serão selecionados."
 
@@ -1999,8 +1878,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:26
-msgid ""
-"Updates the currently modified objects from the server (re-downloads data)"
-msgstr ""
-"Atualizar os objetos atuais modificados pelo servidor (baixa novamente dados)"
+msgid "Updates the currently modified objects from the server (re-downloads data)"
+msgstr "Atualizar os objetos atuais modificados pelo servidor (baixa novamente dados)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74
@@ -2019,9 +1896,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:87
-msgid ""
-"Updates the currently selected objects from the server (re-downloads data)"
-msgstr ""
-"Atualiza os objetos selecionados atualmente a partir do servidor (baixa "
-"novamente os dados)"
+msgid "Updates the currently selected objects from the server (re-downloads data)"
+msgstr "Atualiza os objetos selecionados atualmente a partir do servidor (baixa novamente os dados)"
 
 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:124
@@ -2040,15 +1914,10 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:88
 msgid "Upload all changes in the active data layer to the OSM server"
-msgstr ""
-"Envia todas as mudanças na camada de dados ativa para o servidor do OSM"
+msgstr "Envia todas as mudanças na camada de dados ativa para o servidor do OSM"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:109
 #, java-format
-msgid ""
-"<html>The data to be uploaded participates in unresolved conflicts of layer "
-"''{0}''.<br>You have to resolve them first.</html>"
-msgstr ""
-"<html>Os dados a serem enviados estão relacionados com conflitos não "
-"resolvidos na camada ''{0}''.<br>Você tem que resolvê-los primeiro.</html>"
+msgid "<html>The data to be uploaded participates in unresolved conflicts of layer ''{0}''.<br>You have to resolve them first.</html>"
+msgstr "<html>Os dados a serem enviados estão relacionados com conflitos não resolvidos na camada ''{0}''.<br>Você tem que resolvê-los primeiro.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153
@@ -2068,6 +1937,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:47
 msgid "Upload all changes in the current selection to the OSM server."
-msgstr ""
-"Enviar todas as alterações presentes na seleção atual para o servidor OSM."
+msgstr "Enviar todas as alterações presentes na seleção atual para o servidor OSM."
 
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:267
@@ -2213,9 +2081,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:94
 #, java-format
-msgid ""
-"Ignoring exception because download has been cancelled. Exception was: {0}"
-msgstr ""
-"A ignorar a excepção porque a transferência foi cancelada. A excepção foi: "
-"{0}"
+msgid "Ignoring exception because download has been cancelled. Exception was: {0}"
+msgstr "A ignorar a excepção porque a transferência foi cancelada. A excepção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:142
@@ -2237,10 +2102,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:159
-msgid ""
-"Click to check whether objects in your local dataset are deleted on the "
-"server"
-msgstr ""
-"Clique para verificar se há objetos de seu grupo de dados local que estejam "
-"apagados no servidor"
+msgid "Click to check whether objects in your local dataset are deleted on the server"
+msgstr "Clique para verificar se há objetos de seu grupo de dados local que estejam apagados no servidor"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:163
@@ -2255,17 +2116,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:170
 #, java-format
-msgid ""
-"<html>There are {0} primitives in your local dataset which<br>might be "
-"deleted on the server. If you later try to delete or<br>update them the "
-"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
-"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
-"</strong> to ignore.<br></html>"
-msgstr ""
-"<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem ter "
-"sido apagadas do servidor. Se você posteriormente tentar exclui-las "
-"ou<br>atualizá-las no servidor provavelmente o servidor apontará "
-"um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o estado "
-"dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> para "
-"ignorar.<br></html>"
+msgid "<html>There are {0} primitives in your local dataset which<br>might be deleted on the server. If you later try to delete or<br>update them the server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> to check the state of these primitives<br>on the server.<br>Click <strong>{2}</strong> to ignore.<br></html>"
+msgstr "<html>Existem {0} primitivas no seu conjunto de dados local que<br>podem ter sido apagadas do servidor. Se você posteriormente tentar exclui-las ou<br>atualizá-las no servidor provavelmente o servidor apontará um<br>conflito.<br><br>Clique <strong>{1}</strong> para verificar o estado dessas primitivas<br>no servidor.<br>Clique <strong>{2}</strong> para ignorar.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:183
@@ -2327,9 +2177,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2338,10 +2188,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:247
-msgid ""
-"Click to delete. Shift: delete way segment. Alt: do not delete unused nodes "
-"when deleting a way. Ctrl: delete referring objects."
-msgstr ""
-"Clique para apagar. Shift: apaga segmento de caminho. Alt: não apaga nós não "
-"usados ao apagar um caminho. Ctrl: apaga  objetos referentes."
+msgid "Click to delete. Shift: delete way segment. Alt: do not delete unused nodes when deleting a way. Ctrl: delete referring objects."
+msgstr "Clique para apagar. Shift: apaga segmento de caminho. Alt: não apaga nós não usados ao apagar um caminho. Ctrl: apaga  objetos referentes."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:92
@@ -2412,33 +2258,28 @@
 msgstr "Finalizar desenho."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Extrudar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Criar áreas"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Extrudar Caminho"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Mova um segmento sobre sua normal, então solte o botão do mouse."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
-msgstr ""
-"Marque um retângulo no tamanho desejado, depois solte o botão do mouse."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
-msgid ""
-"Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
-"its normal."
-msgstr ""
-"Carregue um segmento de via para criar um retângulo. Ctrl-carregar para "
-"mover um segmento sobre sua normal."
+msgstr "Marque um retângulo no tamanho desejado, depois solte o botão do mouse."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
+msgid "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along its normal."
+msgstr "Carregue um segmento de via para criar um retângulo. Ctrl-carregar para mover um segmento sobre sua normal."
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:29
@@ -2447,13 +2288,9 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java:82
-msgid ""
-"Drag play head and release near track to play audio from there; SHIFT"
-"+release to synchronize audio at that point."
-msgstr ""
-"Arraste a símbolo de reprodução e solte próximo à trilha para reproduzir "
-"áudio dali. SHIFT+soltar para sincronizar o áudio naquele ponto."
-
+msgid "Drag play head and release near track to play audio from there; SHIFT+release to synchronize audio at that point."
+msgstr "Arraste a símbolo de reprodução e solte próximo à trilha para reproduzir áudio dali. SHIFT+soltar para sincronizar o áudio naquele ponto."
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2465,9 +2302,9 @@
 msgstr "Selecionar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Selecionar, mover e girar objetos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2476,49 +2313,40 @@
 msgstr[1] "Adicionar e mover um novo nó virtual a {0} caminhos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Mover elementos"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Mova-os"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Desfazer mover"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
-"You moved more than {0} elements. Moving a large number of elements is often "
-"an error.\n"
+"You moved more than {0} elements. Moving a large number of elements is often an error.\n"
 "Really move them?"
 msgstr ""
-"Moveu mais de {0} elementos. Mover grandes numeros de elementos é "
-"frequentemente um erro.\n"
+"Moveu mais de {0} elementos. Mover grandes numeros de elementos é frequentemente um erro.\n"
 "Quer realmente move-los?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Solte o botão do mouse para selecionar os objetos no retângulo."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid "Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr "Solte o botão do mouse para parar de mover. Ctrl para agregar ao nó mais próximo."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Solte o botão do mouse para parar de mover. Ctrl para agregar ao nó mais "
-"próximo."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Solte o botão do mouse para parar de girar"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
-msgid ""
-"Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
-"Ctrl to rotate selected; or change selection"
-msgstr ""
-"Arraste para mover objetos; Shift para adicionar seleção (Ctrl para "
-"alternar); Shift-Ctrl para rotacionar seleção; ou altere seleção"
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+msgid "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-Ctrl to rotate selected; or change selection"
+msgstr "Arraste para mover objetos; Shift para adicionar seleção (Ctrl para alternar); Shift-Ctrl para rotacionar seleção; ou altere seleção"
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46
@@ -2532,10 +2360,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:73
-msgid ""
-"Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; "
-"move zoom with right button"
-msgstr ""
-"Amplie arrastando ou Ctrl+. ou Ctrl+,; mova com Ctrl+Acima, Esquerda, "
-"Abaixo, Direita; mova ampliação com o botão direito"
+msgid "Zoom by dragging or Ctrl+. or Ctrl+,; move with Ctrl+up, left, down, right; move zoom with right button"
+msgstr "Amplie arrastando ou Ctrl+. ou Ctrl+,; mova com Ctrl+Acima, Esquerda, Abaixo, Direita; mova ampliação com o botão direito"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:48
@@ -2639,10 +2463,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:183
-msgid ""
-"<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, "
-"<b>type=</b>, <b>*=*</b>, <b>*=</b>"
-msgstr ""
-"<b>type=*</b> - chave ''type'' com qualquer valor. Tente também  <b>*=value</"
-"b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgid "<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
+msgstr "<b>type=*</b> - chave ''type'' com qualquer valor. Tente também  <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:184
@@ -2663,8 +2483,6 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:188
-msgid ""
-"<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
-msgstr ""
-"<b>type:</b> - tipo de objeto (<b>nó</b>, <b>caminho</b>, <b>relação</b>)"
+msgid "<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)"
+msgstr "<b>type:</b> - tipo de objeto (<b>nó</b>, <b>caminho</b>, <b>relação</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:189
@@ -2674,6 +2492,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:190
 msgid "<b>user:anonymous</b> - all objects changed by anonymous users"
-msgstr ""
-"<b>user:anonymous</b> - todos objetos modificados por usuários anônimos"
+msgstr "<b>user:anonymous</b> - todos objetos modificados por usuários anônimos"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:191
@@ -2682,42 +2499,22 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:192
-msgid ""
-"<b>version:</b>... - object with given version (0 objects without an "
-"assigned version)"
-msgstr ""
-"<b>version:</b>... - objeto com a versão fornecida (0 objetos sem uma versão "
-"assignada)"
+msgid "<b>version:</b>... - object with given version (0 objects without an assigned version)"
+msgstr "<b>version:</b>... - objeto com a versão fornecida (0 objetos sem uma versão assignada)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:193
-msgid ""
-"<b>changeset:</b>... - object with given changeset id (0 objects without "
-"assigned changeset)"
-msgstr ""
-"<b>changeset:</b>... - objetos com id de conjunto de modificações fornecido "
-"(0 objetos sem conjunto de modificações assignados)"
+msgid "<b>changeset:</b>... - object with given changeset id (0 objects without assigned changeset)"
+msgstr "<b>changeset:</b>... - objetos com id de conjunto de modificações fornecido (0 objetos sem conjunto de modificações assignados)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:194
-msgid ""
-"<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:"
-"min-max)"
-msgstr ""
-"<b>nós:</b>... - objeto com números de nós determinado (nós:quantidade ou "
-"nós:min-max)"
+msgid "<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:min-max)"
+msgstr "<b>nós:</b>... - objeto com números de nós determinado (nós:quantidade ou nós:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:195
-msgid ""
-"<b>tags:</b>... - object with given number of tags (tags:count or tags:min-"
-"max)"
-msgstr ""
-"<b>marcadores:</b>... - objeto com o número pedido de marcadores (tags:count "
-"ou tags:min-max)"
+msgid "<b>tags:</b>... - object with given number of tags (tags:count or tags:min-max)"
+msgstr "<b>marcadores:</b>... - objeto com o número pedido de marcadores (tags:count ou tags:min-max)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:196
-msgid ""
-"<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-"
-"12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
-msgstr ""
-"<b>marca de tempo («timestamp»):</b>... - objetos com esta marca de tempo "
-"(<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b> ...)"
+msgid "<b>timestamp:</b>... -  objects with this timestamp (<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> or <b>T14:51</b> ...)"
+msgstr "<b>marca de tempo («timestamp»):</b>... - objetos com esta marca de tempo (<b>2009-11-12T14:51:09Z</b>, <b>2009-11-12</b> ou <b>T14:51</b> ...)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:197
@@ -2738,15 +2535,10 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:201
-msgid ""
-"<b>child <i>expr</i></b> - all children of objects matching the expression"
-msgstr ""
-"<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
+msgid "<b>child <i>expr</i></b> - all children of objects matching the expression"
+msgstr "<b>child <i>expr</i></b> - todos objetos filhos que coincidem com a expressão"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:202
-msgid ""
-"<b>parent <i>expr</i></b> - all parents of objects matching the expression"
-msgstr ""
-"<b>parent <i>expr</i></b> - todos os pais de objetos que coincidem com a "
-"expressão"
+msgid "<b>parent <i>expr</i></b> - all parents of objects matching the expression"
+msgstr "<b>parent <i>expr</i></b> - todos os pais de objetos que coincidem com a expressão"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:203
@@ -2756,14 +2548,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:204
 msgid "Use <b>\"</b> to quote operators (e.g. if key contains <b>:</b>)"
-msgstr ""
-"Usar <b>\"</b> para comentar operadores (ex. se uma chave contem <b>:</b>)"
+msgstr "Usar <b>\"</b> para comentar operadores (ex. se uma chave contem <b>:</b>)"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:205
-msgid ""
-"Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be "
-"escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
-msgstr ""
-"Em strings entre aspas, os caracteres <b>\"</b> e <b>\\</b> necessitam ser "
-"precedidos por <b>\\</b> (ex: <b>\\\"</b> e <b>\\\\</b>)."
+msgid "Within quoted strings the <b>\"</b> and <b>\\</b> characters need to be escaped by a preceding <b>\\</b> (e.g. <b>\\\"</b> and <b>\\\\</b>)."
+msgstr "Em strings entre aspas, os caracteres <b>\"</b> e <b>\\</b> necessitam ser precedidos por <b>\\</b> (ex: <b>\\\"</b> e <b>\\\\</b>)."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:206
@@ -2842,6 +2629,5 @@
 "{2}"
 msgstr ""
-"A expressão regular \"{0}\" teve um erro de interpretação na posição {1}, "
-"erro completo:\n"
+"A expressão regular \"{0}\" teve um erro de interpretação na posição {1}, erro completo:\n"
 "\n"
 "{2}"
@@ -2849,7 +2635,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:254
 msgid "Key cannot be empty when tag operator is used. Sample use: key=value"
-msgstr ""
-"Chave não pode ser apagada quando o operador está sendo usado. Exemplo: "
-"chave=valor"
+msgstr "Chave não pode ser apagada quando o operador está sendo usado. Exemplo: chave=valor"
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:296
@@ -2861,7 +2645,5 @@
 #, java-format
 msgid "Unknown primitive type: {0}. Allowed values are node, way or relation"
-msgstr ""
-"Tipo de primitiva desconhecida: {0}. Os valores permitidos são nó, caminho "
-"ou relação."
+msgstr "Tipo de primitiva desconhecida: {0}. Os valores permitidos são nó, caminho ou relação."
 
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:595
@@ -2902,18 +2684,11 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58
 #, java-format
-msgid ""
-"Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
-msgstr ""
-"Aviso: truncando automaticamente valor da etiqueta \"{0}\" no objeto apagado "
-"{1}"
+msgid "Warning: automatically truncating value of tag ''{0}'' on deleted object {1}"
+msgstr "Aviso: truncando automaticamente valor da etiqueta \"{0}\" no objeto apagado {1}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:67
 #, java-format
-msgid ""
-"Length of value for tag ''{0}'' on object {1} exceeds the max. allowed "
-"length {2}. Values length is {3}."
-msgstr ""
-"O tamanho do valor para a etiqueta ''{0}''  no objeto {1} supera o máximo "
-"permitido {2}. O máximo é {3}."
+msgid "Length of value for tag ''{0}'' on object {1} exceeds the max. allowed length {2}. Values length is {3}."
+msgstr "O tamanho do valor para a etiqueta ''{0}''  no objeto {1} supera o máximo permitido {2}. O máximo é {3}."
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70
@@ -2924,6 +2699,5 @@
 #, java-format
 msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
-msgstr ""
-"{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}"
+msgstr "{0} nós no caminho {1} ultrapassam o número máximo de nós permitidos {2}"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:87
@@ -2937,12 +2711,6 @@
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:47
 #, java-format
-msgid ""
-"<html>{0} relations build a cycle because they refer to each other.<br>JOSM "
-"cannot upload them. Please edit the relations and remove the cyclic "
-"dependency.</html>"
-msgstr ""
-"<html>{0} relações formam um ciclo porque elas referem umas às outras.<br>O "
-"JOSM não pode enviá-las. Por favor edite-as e remova a dependência cíclica.</"
-"html>"
+msgid "<html>{0} relations build a cycle because they refer to each other.<br>JOSM cannot upload them. Please edit the relations and remove the cyclic dependency.</html>"
+msgstr "<html>{0} relações formam um ciclo porque elas referem umas às outras.<br>O JOSM não pode enviá-las. Por favor edite-as e remova a dependência cíclica.</html>"
 
 #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53
@@ -3047,10 +2815,6 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:32
 #, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This "
-"conflict cannot be added.</html>"
-msgstr ""
-"<html>A camada ''{0}'' já se encontra em conflicto com a "
-"primitiva<br>''{1}''.<br>Este conflito não pode ser adicionado.</html>"
+msgid "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>This conflict cannot be added.</html>"
+msgstr "<html>A camada ''{0}'' já se encontra em conflicto com a primitiva<br>''{1}''.<br>Este conflito não pode ser adicionado.</html>"
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
@@ -3061,10 +2825,6 @@
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:54
 #, java-format
-msgid ""
-"Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for "
-"primitive ''{1}''."
-msgstr ""
-"Aviso: Camada \"{0}\" já não existe mais. Não foi possível remover a "
-"primitiva \"{1}\"."
+msgid "Warning: Layer ''{0}'' does not exist any more. Cannot remove conflict for primitive ''{1}''."
+msgstr "Aviso: Camada \"{0}\" já não existe mais. Não foi possível remover a primitiva \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:70
@@ -3077,9 +2837,6 @@
 #: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:89
 #, java-format
-msgid ""
-"Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
-msgstr ""
-"Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está "
-"mais presente"
+msgid "Cannot undo command ''{0}'' because layer ''{1}'' is not present any more"
+msgstr "Não é possível desfazer comando \"{0}\" porque a camada \"{1}\" não está mais presente"
 
 #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:46
@@ -3097,6 +2854,5 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:110
 msgid "At least one object to delete required, got empty collection"
-msgstr ""
-"Ao menos um objeto para apagar é requirido, mas foi obtido coleção vazia"
+msgstr "Ao menos um objeto para apagar é requirido, mas foi obtido coleção vazia"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:159
@@ -3147,12 +2903,6 @@
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:433
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateNode.java:162
-msgid ""
-"You are about to delete nodes outside of the area you have downloaded."
-"<br>This can cause problems because other objects (that you do not see) "
-"might use them.<br>Do you really want to delete?"
-msgstr ""
-"Você está a ponto de apagar nós fora da área que fez download de dados.<br> "
-"Isto pode causar problemas, já que outros objetos que você não pode ver "
-"podem estar usando estes pontos.<br> Deseja realmente apagar?"
+msgid "You are about to delete nodes outside of the area you have downloaded.<br>This can cause problems because other objects (that you do not see) might use them.<br>Do you really want to delete?"
+msgstr "Você está a ponto de apagar nós fora da área que fez download de dados.<br> Isto pode causar problemas, já que outros objetos que você não pode ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
 
 #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:441
@@ -3202,10 +2952,6 @@
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:152
 #, java-format
-msgid ""
-"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
-"{1}"
-msgstr ""
-"Aviso: Limpando via {0}  porque o número de nós reduziu para abaixo de 2. "
-"Atualmente é {1}"
+msgid "Warning: Purging way {0} because number of nodes dropped below 2. Current is {1}"
+msgstr "Aviso: Limpando via {0}  porque o número de nós reduziu para abaixo de 2. Atualmente é {1}"
 
 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:161
@@ -3281,11 +3027,7 @@
 msgstr "Aplicar?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
-msgid ""
-"When reversing this way, the following changes to properties of the way and "
-"its nodes are suggested in order to maintain data consistency."
-msgstr ""
-"Ao reverter esta via, as seguintes alterações nas propriedades dela e em "
-"seus nós são sugeridas para manter a consistência dos dados."
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
+msgid "When reversing this way, the following changes to properties of the way and its nodes are suggested in order to maintain data consistency."
+msgstr "Ao reverter esta via, as seguintes alterações nas propriedades dela e em seus nós são sugeridas para manter a consistência dos dados."
 
 #: ../core/src/org/openstreetmap/josm/corrector/RoleCorrectionTableModel.java:26
@@ -3366,82 +3108,46 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:449
 #, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Preference directory ''{0}'' is "
-"not a directory."
-msgstr ""
-"Aviso: Falhou a inicialização das preferências. A directória da preferência "
-"\"{0}\" não é uma directória."
+msgid "Warning: Failed to initialize preferences. Preference directory ''{0}'' is not a directory."
+msgstr "Aviso: Falhou a inicialização das preferências. A directória da preferência \"{0}\" não é uma directória."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:452
 #, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is "
-"not a directory.</html>"
-msgstr ""
-"<html> Falhou a inicialização das preferências.<br>A directória da "
-"preferência \"{0}\" não é uma directória.</html>"
+msgid "<html>Failed to initialize preferences.<br>Preference directory ''{0}'' is not a directory.</html>"
+msgstr "<html> Falhou a inicialização das preferências.<br>A directória da preferência \"{0}\" não é uma directória.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:460
 #, java-format
-msgid ""
-"Warning: Failed to initialize preferences. Failed to create missing "
-"preference directory: {0}"
-msgstr ""
-"Aviso: Falhou a inicialização das preferências. Falhou a criação devido a "
-"falta da directória da preferência: {0}"
+msgid "Warning: Failed to initialize preferences. Failed to create missing preference directory: {0}"
+msgstr "Aviso: Falhou a inicialização das preferências. Falhou a criação devido a falta da directória da preferência: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:463
 #, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to create missing "
-"preference directory: {0}</html>"
-msgstr ""
-"<html>Aviso: Falhou a inicialização das preferências.<br>Falhou a criação "
-"devido a falta da directória da preferência: {0}</html>"
+msgid "<html>Failed to initialize preferences.<br>Failed to create missing preference directory: {0}</html>"
+msgstr "<html>Aviso: Falhou a inicialização das preferências.<br>Falhou a criação devido a falta da directória da preferência: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:474
 #, java-format
-msgid ""
-"Warning: Missing preference file ''{0}''. Creating a default preference file."
-msgstr ""
-"Aviso: Falta o ficheiro das preferencias \"{0}\". A criar um ficheiro de "
-"preferências base."
+msgid "Warning: Missing preference file ''{0}''. Creating a default preference file."
+msgstr "Aviso: Falta o ficheiro das preferencias \"{0}\". A criar um ficheiro de preferências base."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:478
 #, java-format
-msgid ""
-"Warning: Replacing existing preference file ''{0}'' with default preference "
-"file."
-msgstr ""
-"Aviso: A substituir o ficheiro de preferências existente \"{0} com o "
-"ficheiro de preferência base."
+msgid "Warning: Replacing existing preference file ''{0}'' with default preference file."
+msgstr "Aviso: A substituir o ficheiro de preferências existente \"{0} com o ficheiro de preferência base."
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:486
 #, java-format
-msgid ""
-"<html>Failed to initialize preferences.<br>Failed to reset preference file "
-"to default: {0}</html>"
-msgstr ""
-"<html>Falhou a inicialização das preferências.<br>Falhou o reset do ficheiro "
-"de preferências base: {0}</html>"
+msgid "<html>Failed to initialize preferences.<br>Failed to reset preference file to default: {0}</html>"
+msgstr "<html>Falhou a inicialização das preferências.<br>Falhou o reset do ficheiro de preferências base: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:499
 #, java-format
-msgid ""
-"<html>Preferences file had errors.<br> Making backup of old one to <br>{0}"
-"<br> and creating a new default preference file.</html>"
-msgstr ""
-"<html>O ficheiro de preferências contêm erros.<br> A fazer uma cópia de "
-"segurança do antigo para <br>{0}<br> e a criar um novo ficheiro de "
-"preferências base.</html>"
+msgid "<html>Preferences file had errors.<br> Making backup of old one to <br>{0}<br> and creating a new default preference file.</html>"
+msgstr "<html>O ficheiro de preferências contêm erros.<br> A fazer uma cópia de segurança do antigo para <br>{0}<br> e a criar um novo ficheiro de preferências base.</html>"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:509
 #, java-format
-msgid ""
-"Warning: Failed to initialize preferences.Failed to reset preference file to "
-"default: {0}"
-msgstr ""
-"Aviso: Falha a inicializar as preferências. Falha no reset do ficheiro de "
-"preferências para original: {0}"
+msgid "Warning: Failed to initialize preferences.Failed to reset preference file to default: {0}"
+msgstr "Aviso: Falha a inicializar as preferências. Falha no reset do ficheiro de preferências para original: {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:535
@@ -3452,9 +3158,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Preferences.java:545
 #, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
-msgstr ""
-"Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark "
-"''{2}''"
+msgid "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark file ''{2}''"
+msgstr "Erro: Valor double ilegal ''{0}'' na linha ''{1}'' do arquivo de bookmark ''{2}''"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:94
@@ -3479,18 +3182,11 @@
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:212
 #, java-format
-msgid ""
-"Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from "
-"server"
-msgstr ""
-"Erro: Valor real ilegal \"{0}\" na linha \"{1}\" na lista de favoritos do "
-"servidor"
+msgid "Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from server"
+msgstr "Erro: Valor real ilegal \"{0}\" na linha \"{1}\" na lista de favoritos do servidor"
 
 #: ../core/src/org/openstreetmap/josm/data/ServerSidePreferences.java:229
 #, java-format
-msgid ""
-"Failed to load bookmarks from ''{0}'' for security reasons. Exception was: "
-"{1}"
-msgstr ""
-"Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: {1}"
+msgid "Failed to load bookmarks from ''{0}'' for security reasons. Exception was: {1}"
+msgstr "Falha ao carregar favoritos de \"{0}\" por razões de segurança. Exceção: {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:47
@@ -3506,9 +3202,6 @@
 #: ../core/src/org/openstreetmap/josm/data/Version.java:112
 #, java-format
-msgid ""
-"Warning: unexpected JOSM version number in revison file, value is ''{0}''"
-msgstr ""
-"Aviso: número de versão do JOSM inesperada no arquivo de revisão. O valor é "
-"\"{0}\""
+msgid "Warning: unexpected JOSM version number in revison file, value is ''{0}''"
+msgstr "Aviso: número de versão do JOSM inesperada no arquivo de revisão. O valor é \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/data/Version.java:145
@@ -3568,21 +3261,11 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:200
 #, java-format
-msgid ""
-"Unable to add primitive {0} to the dataset because it is already included"
-msgstr ""
-"Impossível adicionar primitiva {0} no conjunto de dados porque ela já está "
-"incluída"
+msgid "Unable to add primitive {0} to the dataset because it is already included"
+msgstr "Impossível adicionar primitiva {0} no conjunto de dados porque ela já está incluída"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:635
 #, java-format
-msgid ""
-"JOSM expected to find primitive [{0} {1}] in dataset but it is not there. "
-"Please report this  at http://josm.openstreetmap.de . This is not a critical "
-"error, it should be safe to continue in your work."
-msgstr ""
-"O JOSM esperava encontrar a primitiva [{0} {1}] no conjunto de dados, mas "
-"ela não está lá. Por favor reporte isso em http://josm.openstreetmap.de . "
-"Esse não é um erro crítico e então deve ser seguro continuar com o seu "
-"trabalho."
+msgid "JOSM expected to find primitive [{0} {1}] in dataset but it is not there. Please report this  at http://josm.openstreetmap.de . This is not a critical error, it should be safe to continue in your work."
+msgstr "O JOSM esperava encontrar a primitiva [{0} {1}] no conjunto de dados, mas ela não está lá. Por favor reporte isso em http://josm.openstreetmap.de . Esse não é um erro crítico e então deve ser seguro continuar com o seu trabalho."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:147
@@ -3617,12 +3300,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:258
 #, java-format
-msgid ""
-"Target object with id {0} and version {1} is visible although source object "
-"with lower version {2} is not visible. Cannot deal with this inconsistency. "
-"Keeping target object. "
-msgstr ""
-"Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto com "
-"versão menor {2} não é visível. Não é possível lidar com essa "
-"inconsistência. Mantendo objeto alvo. "
+msgid "Target object with id {0} and version {1} is visible although source object with lower version {2} is not visible. Cannot deal with this inconsistency. Keeping target object. "
+msgstr "Objeto alvo com id {0} e versão {1} é visível, porém o source do objeto com versão menor {2} não é visível. Não é possível lidar com essa inconsistência. Mantendo objeto alvo. "
 
 #. translators notes must be in front
@@ -3722,26 +3399,15 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:742
 #, java-format
-msgid ""
-"Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is "
-"{0}"
-msgstr ""
-"Não é possível configurar um changesetId > 0 para uma nova primitiva. Valor "
-"do changesetId é {0}"
+msgid "Cannot assign a changesetId > 0 to a new primitive. Value of changesetId is {0}"
+msgstr "Não é possível configurar um changesetId > 0 para uma nova primitiva. Valor do changesetId é {0}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1114
-msgid ""
-"Cannot merge because either of the participating primitives is new and the "
-"other is not"
-msgstr ""
-"Não foi possível mesclar porque uma das primitivas envolvidas é nova e a "
-"outra não"
+msgid "Cannot merge because either of the participating primitives is new and the other is not"
+msgstr "Não foi possível mesclar porque uma das primitivas envolvidas é nova e a outra não"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:1116
 #, java-format
-msgid ""
-"Cannot merge primitives with different ids. This id is {0}, the other is {1}"
-msgstr ""
-"Não é possível fazer merge com primitivas de ids diferentes. Esse id é {0}, "
-"o outro é {1}"
+msgid "Cannot merge primitives with different ids. This id is {0}, the other is {1}"
+msgstr "Não é possível fazer merge com primitivas de ids diferentes. Esse id é {0}, o outro é {1}"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
@@ -3780,10 +3446,6 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:627
 #: ../core/src/org/openstreetmap/josm/data/osm/TagCollection.java:645
-msgid ""
-"Tag collection cannot be applied to a primitive because there are keys with "
-"multiple values."
-msgstr ""
-"Coleção de Tag não pode ser aplicada à primitiva porque há chaves com "
-"valores múltiplos."
+msgid "Tag collection cannot be applied to a primitive because there are keys with multiple values."
+msgstr "Coleção de Tag não pode ser aplicada à primitiva porque há chaves com valores múltiplos."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
@@ -3796,7 +3458,5 @@
 #, java-format
 msgid "Cannot compare primitive with ID ''{0}'' to primitive with ID ''{1}''."
-msgstr ""
-"Não é possível comparar a primitiva com ID \"{0}\" com a primitiva ID \"{1}"
-"\"."
+msgstr "Não é possível comparar a primitiva com ID \"{0}\" com a primitiva ID \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java:48
@@ -3900,12 +3560,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "conexão"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "etiquetado"
+msgstr ""
 
 #. teal
@@ -3949,10 +3607,6 @@
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:100
 #, java-format
-msgid ""
-"Warning: failed to open input stream for resource ''/data/{0}''. Cannot load "
-"NTF<->RGF93 grid"
-msgstr ""
-"Aviso: não foi possível abrir o fluxo de entrada do recurso ''/data/{0}''. "
-"Não foi possível ler o grid NTF<->RGF93"
+msgid "Warning: failed to open input stream for resource ''/data/{0}''. Cannot load NTF<->RGF93 grid"
+msgstr "Aviso: não foi possível abrir o fluxo de entrada do recurso ''/data/{0}''. Não foi possível ler o grid NTF<->RGF93"
 
 #: ../core/src/org/openstreetmap/josm/data/projection/Lambert.java:137
@@ -4054,6 +3708,5 @@
 #, java-format
 msgid "<html>Could not read bookmarks from<br>''{0}''<br>Error was: {1}</html>"
-msgstr ""
-"<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
+msgstr "<html>Não foi possível ler favoritos de<br>''{0}''<br>O erro foi: {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/BookmarkList.java:78
@@ -4089,5 +3742,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "ferrovia"
@@ -4222,6 +3875,5 @@
 #, java-format
 msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''"
-msgstr ""
-"Era esperado um valor não-vazio para o parâmetro ''{0}'', mas recebi ''{1}''"
+msgstr "Era esperado um valor não-vazio para o parâmetro ''{0}'', mas recebi ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37
@@ -4259,26 +3911,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:57
-msgid ""
-"Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a "
-"filename"
-msgstr ""
-"Baixar cada um. Pode ser x1,y1,x2,y2, uma URL contendo lat=y&lon=x&zoom=z ou "
-"um arquivo"
+msgid "Download each. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a filename"
+msgstr "Baixar cada um. Pode ser x1,y1,x2,y2, uma URL contendo lat=y&lon=x&zoom=z ou um arquivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:58
-msgid ""
-"Download each as raw gps. Can be x1,y1,x2,y2 an URL containing "
-"lat=y&lon=x&zoom=z or a filename"
-msgstr ""
-"Baixar cada uma como raw gps. Pode ser x1,y1,x2,y2 ou uma URL contendo "
-"lat=y&lon=x&zoom=z ou um nome de arquivo"
+msgid "Download each as raw gps. Can be x1,y1,x2,y2 an URL containing lat=y&lon=x&zoom=z or a filename"
+msgstr "Baixar cada uma como raw gps. Pode ser x1,y1,x2,y2 ou uma URL contendo lat=y&lon=x&zoom=z ou um nome de arquivo"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:59
-msgid ""
-"Add each to the initial selection. Can be a google-like search string or an "
-"URL which returns osm-xml"
-msgstr ""
-"Adicionar todos à seleção inicial. Pode ser um texto de busca no estilo "
-"Google ou uma URL que retorne um osm-xml"
+msgid "Add each to the initial selection. Can be a google-like search string or an URL which returns osm-xml"
+msgstr "Adicionar todos à seleção inicial. Pode ser um texto de busca no estilo Google ou uma URL que retorne um osm-xml"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:60
@@ -4326,7 +3966,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:79
 msgid "Open a file (any file type that can be opened with File/Open)"
-msgstr ""
-"Abrir um arquivo (qualquer tipo de arquivo que pode ser aberto via Arquivo/"
-"Abrir)"
+msgstr "Abrir um arquivo (qualquer tipo de arquivo que pode ser aberto via Arquivo/Abrir)"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:80
@@ -4368,13 +4006,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:88
 msgid ""
-"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add "
-"the following\n"
-"      Java option to specify the maximum size of allocated memory in "
-"megabytes"
-msgstr ""
-"note: Para algumas tarefas, o JOSM precisa de muita memória. Por isso pode "
-"ser necessário adicionar estas\n"
-"      opções Java para especificar o tamanho máximo da memória alocada, em "
-"megabytes"
+"note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n"
+"      Java option to specify the maximum size of allocated memory in megabytes"
+msgstr ""
+"note: Para algumas tarefas, o JOSM precisa de muita memória. Por isso pode ser necessário adicionar estas\n"
+"      opções Java para especificar o tamanho máximo da memória alocada, em megabytes"
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:91
@@ -4383,10 +4017,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:98
-msgid ""
-"Parameters --download, --downloadgps, and --selection are processed in this "
-"order."
-msgstr ""
-"Parâmetros --download, --downloadgps, e --selection são processados nessa "
-"ordem."
+msgid "Parameters --download, --downloadgps, and --selection are processed in this order."
+msgstr "Parâmetros --download, --downloadgps, e --selection são processados nessa ordem."
 
 #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:99
@@ -4541,7 +4171,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/MapStatus.java:203
-msgid ""
-"Middle click again to cycle through.<br>Hold CTRL to select directly from "
-"this list with the mouse.<hr>"
+msgid "Middle click again to cycle through.<br>Hold CTRL to select directly from this list with the mouse.<hr>"
 msgstr ""
 
@@ -4578,9 +4206,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:96
-msgid ""
-"partial: different selected objects have different values, do not change"
-msgstr ""
-"parcial: objetos diferentes selecionados possuem valores diferentes, não "
-"altere"
+msgid "partial: different selected objects have different values, do not change"
+msgstr "parcial: objetos diferentes selecionados possuem valores diferentes, não altere"
 
 #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:101
@@ -4589,29 +4214,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:150
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>1 "
-"relation</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme para remover <strong>1 objeto</strong> de <strong>1 "
-"relação</strong>.</html>"
+msgid "<html>Please confirm to remove <strong>1 object</strong> from <strong>1 relation</strong>.</html>"
+msgstr "<html>Por favor confirme para remover <strong>1 objeto</strong> de <strong>1 relação</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:152
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:154
 #, java-format
-msgid ""
-"<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por favor confirme para remover <strong>1 objeto</strong>  de <strong>"
-"{0} relações</strong>.</html>"
+msgid "<html>Please confirm to remove <strong>1 object</strong> from <strong>{0} relations</strong>.</html>"
+msgstr "<html>Por favor confirme para remover <strong>1 objeto</strong>  de <strong>{0} relações</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:156
 #, java-format
-msgid ""
-"<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} "
-"relations</strong>.</html>"
-msgstr ""
-"<html>Por gentileza confirme a remoção de <strong>{0} objetos</strong> de "
-"<strong>{1} relações</strong>.</html>"
+msgid "<html>Please confirm to remove <strong>{0} objects</strong> from <strong>{1} relations</strong>.</html>"
+msgstr "<html>Por gentileza confirme a remoção de <strong>{0} objetos</strong> de <strong>{1} relações</strong>.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:165
@@ -4659,10 +4272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:230
-msgid ""
-"<html>Please select a <strong>range of OSM tiles</strong> at a given zoom "
-"level.</html>"
-msgstr ""
-"<html>Por gentileza selecione o <strong>intervalo de tiles OSM</strong> em "
-"um determinado nível de zoom.</html>"
+msgid "<html>Please select a <strong>range of OSM tiles</strong> at a given zoom level.</html>"
+msgstr "<html>Por gentileza selecione o <strong>intervalo de tiles OSM</strong> em um determinado nível de zoom.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:237
@@ -4679,14 +4288,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:439
-msgid ""
-"<html>Alternatively you may enter a <strong>tile address</strong> for a "
-"single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile "
-"adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</"
-"html>"
-msgstr ""
-"<html>Como alternatica você pode digitar o <strong>endereço de um tile</"
-"strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. Os "
-"endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são válidos.</"
-"html>"
+msgid "<html>Alternatively you may enter a <strong>tile address</strong> for a single tile in the format <i>zoomlevel/x/y</i>, i.e. <i>15/256/223</i>. Tile adresses in the format <i>zoom,x,y</i> or <i>zoom;x;y</i> are valid too.</html>"
+msgstr "<html>Como alternatica você pode digitar o <strong>endereço de um tile</strong> no formato <i>nível de zoom/x/y</i>, i.e. <i>15/256/223</i>. Os endereços no formato <i>zoom,x,y</i> ou <i>zoom;x;y</i> também são válidos.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/bbox/TileSelectionBBoxChooser.java:453
@@ -4793,9 +4394,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
-msgid ""
-"Merged node list frozen. No pending conflicts in the node list of this way"
-msgstr ""
-"Nós mesclados da lista estão congelados. Não existe conflitos pendentes na "
-"lista de nós desta via."
+msgid "Merged node list frozen. No pending conflicts in the node list of this way"
+msgstr "Nós mesclados da lista estão congelados. Não existe conflitos pendentes na lista de nós desta via."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
@@ -4812,10 +4410,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
-msgid ""
-"Merged member list frozen. No pending conflicts in the member list of this "
-"relation"
-msgstr ""
-"Membros mesclados da lista estão congelados. Não existe conflitos pendentes "
-"na lista de membros desta relação"
+msgid "Merged member list frozen. No pending conflicts in the member list of this relation"
+msgstr "Membros mesclados da lista estão congelados. Não existe conflitos pendentes na lista de membros desta relação"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
@@ -4849,10 +4443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:325
-msgid ""
-"The following primitives could not be copied to the target "
-"primitive<br>because they are deleted in the target dataset:"
-msgstr ""
-"As seguintes primitivas não puderam ser copiadas para a primitiva "
-"destino<br>porque elas estão apagadas no conjuntos de dados destino:"
+msgid "The following primitives could not be copied to the target primitive<br>because they are deleted in the target dataset:"
+msgstr "As seguintes primitivas não puderam ser copiadas para a primitiva destino<br>porque elas estão apagadas no conjuntos de dados destino:"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java:335
@@ -4900,10 +4490,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287
-msgid ""
-"List of merged elements. They will replace the my elements when the merge "
-"decisions are applied."
-msgstr ""
-"Lista de elementos mesclados. Eles irão substituir os meus elementos quando "
-"as decisões de mesclagem forem aplicadas."
+msgid "List of merged elements. They will replace the my elements when the merge decisions are applied."
+msgstr "Lista de elementos mesclados. Eles irão substituir os meus elementos quando as decisões de mesclagem forem aplicadas."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
@@ -4914,6 +4500,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293
 msgid "List of elements in their dataset, i.e. the server dataset"
-msgstr ""
-"Lista de elementos de seu conjunto de dados, ou seja, o servidor de dados"
+msgstr "Lista de elementos de seu conjunto de dados, ou seja, o servidor de dados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:425
@@ -4931,52 +4516,29 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:454
 msgid "Copy my selected elements to the end of the list of merged elements."
-msgstr ""
-"Copiar meus elementos selecionados para o fim da lista de elementos "
-"combinados"
+msgstr "Copiar meus elementos selecionados para o fim da lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:481
-msgid ""
-"Copy my selected elements before the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copiar meus elementos selecionados antes do primeiro elemento selecionado na "
-"lista de elementos combinados"
+msgid "Copy my selected elements before the first selected element in the list of merged elements."
+msgstr "Copiar meus elementos selecionados antes do primeiro elemento selecionado na lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:515
-msgid ""
-"Copy my selected elements after the first selected element in the list of "
-"merged elements."
-msgstr ""
-"Copiar meus elementos selecionados depois do primeiro elemento selecionado "
-"na lista de elementos combinados"
+msgid "Copy my selected elements after the first selected element in the list of merged elements."
+msgstr "Copiar meus elementos selecionados depois do primeiro elemento selecionado na lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:544
-msgid ""
-"Copy their selected element to the start of the list of merged elements."
-msgstr ""
-"Copiar os elementos selecionados deles para o começo da lista de elementos "
-"combinados"
+msgid "Copy their selected element to the start of the list of merged elements."
+msgstr "Copiar os elementos selecionados deles para o começo da lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:566
 msgid "Copy their selected elements to the end of the list of merged elements."
-msgstr ""
-"Copiar os elementos selecionados deles para o fim da lista de elementos "
-"combinados"
+msgstr "Copiar os elementos selecionados deles para o fim da lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:588
-msgid ""
-"Copy their selected elements before the first selected element in the list "
-"of merged elements."
-msgstr ""
-"Copiar os elementos selecionados deles antes do primeiro elemento "
-"selecionado na lista de elementos combinados"
+msgid "Copy their selected elements before the first selected element in the list of merged elements."
+msgstr "Copiar os elementos selecionados deles antes do primeiro elemento selecionado na lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:617
-msgid ""
-"Copy their selected element after the first selected element in the list of "
-"merged elements"
-msgstr ""
-"Copiar os elementos selecionados deles para depois do primeiro elemento "
-"selecionado na lista de elementos combinados"
+msgid "Copy their selected element after the first selected element in the list of merged elements"
+msgstr "Copiar os elementos selecionados deles para depois do primeiro elemento selecionado na lista de elementos combinados"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643
@@ -5040,19 +4602,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:850
 #, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to start merging my and their entries.</"
-"html>"
-msgstr ""
-"<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas "
-"e as deles</html>"
+msgid "<html>Click <strong>{0}</strong> to start merging my and their entries.</html>"
+msgstr "<html>Clique <strong>{0}</strong> para começar a combinar as minhas entradas e as deles</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:855
 #, java-format
-msgid ""
-"<html>Click <strong>{0}</strong> to finish merging my and their entries.</"
-"html>"
-msgstr ""
-"<html>Clique <strong>{0}</strong> para terminar de combinar as minhas "
-"entradas e as deles</html>"
+msgid "<html>Click <strong>{0}</strong> to finish merging my and their entries.</html>"
+msgstr "<html>Clique <strong>{0}</strong> para terminar de combinar as minhas entradas e as deles</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:873
@@ -5080,10 +4634,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java:79
 #, java-format
-msgid ""
-"Adjustable {0} not registered yet. Cannot set participation in synchronized "
-"adjustment."
-msgstr ""
-"Ajustável {0} não registrado ainda. Não foi possível configurar participação "
-"no ajuste sincronizado."
+msgid "Adjustable {0} not registered yet. Cannot set participation in synchronized adjustment."
+msgstr "Ajustável {0} não registrado ainda. Não foi possível configurar participação no ajuste sincronizado."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:957
@@ -5099,16 +4649,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
 msgid "Merged nodes not frozen yet. Cannot build resolution command."
-msgstr ""
-"Nós mesclados ainda não congelados. Não é possível construir comando de "
-"resolução"
+msgstr "Nós mesclados ainda não congelados. Não é possível construir comando de resolução"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
 #, java-format
-msgid ""
-"<html>An error occurred while communicating with the server<br>Details: {0}</"
-"html>"
-msgstr ""
-"<html>Um erro ocorreu durante a comunicação com o servidor.<br>Detalhes: {0}"
-"</html>"
+msgid "<html>An error occurred while communicating with the server<br>Details: {0}</html>"
+msgstr "<html>Um erro ocorreu durante a comunicação com o servidor.<br>Detalhes: {0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:468
@@ -5128,16 +4672,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:515
 #, java-format
-msgid ""
-"There is {0} additional node used by way {1}<br>which is deleted on the "
-"server.<br><br>Do you want to undelete this node too?"
-msgid_plural ""
-"There are {0} additional nodes used by way {1}<br>which are deleted on the "
-"server.<br><br>Do you want to undelete these nodes too?"
-msgstr[0] ""
-"Existe {0} nó adicional usado pela via {1}<br>que está apagado no servidor."
-"<br><br>Você quer recuperar este nó também?"
-msgstr[1] ""
-"Existem {0} nós adicionais usados pela via {1}<br>que estão apagados no "
-"servidor.<br><br>Você quer recuperar estes nós também?"
+msgid "There is {0} additional node used by way {1}<br>which is deleted on the server.<br><br>Do you want to undelete this node too?"
+msgid_plural "There are {0} additional nodes used by way {1}<br>which are deleted on the server.<br><br>Do you want to undelete these nodes too?"
+msgstr[0] "Existe {0} nó adicional usado pela via {1}<br>que está apagado no servidor.<br><br>Você quer recuperar este nó também?"
+msgstr[1] "Existem {0} nós adicionais usados pela via {1}<br>que estão apagados no servidor.<br><br>Você quer recuperar estes nós também?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:525
@@ -5147,18 +4683,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:549
 #, java-format
-msgid ""
-"There is {0} additional primitive referred to by relation {1}<br>which is "
-"deleted on the server.<br><br>Do you want to undelete this too?"
-msgid_plural ""
-"There are {0} additional primitives referred to by relation {1}<br>which are "
-"deleted on the server.<br><br>Do you want to undelete these too?"
-msgstr[0] ""
-"Existe {0} primitivo adicional referenciado pela relação {1}<br>que foi "
-"removido no servidor.<br><br>Você quer desfazer a remoção deste primitivo "
-"também?"
-msgstr[1] ""
-"Existem {0} primitivos adicionais referenciados pela relação {1}<br>que "
-"foram removidos no servidor.<br><br>Você quer desfazer a remoção destes "
-"primitivos também?"
+msgid "There is {0} additional primitive referred to by relation {1}<br>which is deleted on the server.<br><br>Do you want to undelete this too?"
+msgid_plural "There are {0} additional primitives referred to by relation {1}<br>which are deleted on the server.<br><br>Do you want to undelete these too?"
+msgstr[0] "Existe {0} primitivo adicional referenciado pela relação {1}<br>que foi removido no servidor.<br><br>Você quer desfazer a remoção deste primitivo também?"
+msgstr[1] "Existem {0} primitivos adicionais referenciados pela relação {1}<br>que foram removidos no servidor.<br><br>Você quer desfazer a remoção destes primitivos também?"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:559
@@ -5171,10 +4697,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
-msgid ""
-"Properties in the merged element. They will replace properties in my "
-"elements when merge decisions are applied."
-msgstr ""
-"Propriedades no elemento combinado. Elas irão substituir propriedades nos "
-"meus elementos quando decisões de combinação forem aplicadas."
+msgid "Properties in the merged element. They will replace properties in my elements when merge decisions are applied."
+msgstr "Propriedades no elemento combinado. Elas irão substituir propriedades nos meus elementos quando decisões de combinação forem aplicadas."
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
@@ -5266,12 +4788,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
 #, java-format
-msgid ""
-"<html>To keep your local version, JOSM<br>has to reset the id of primitive "
-"{0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do "
-"yo agree?</html>"
-msgstr ""
-"<html>Para manter a versão local, o JOSM<br>precisa resetar o id do "
-"primitivo {0} para zero.<br>No próximo envio o servidor irá designar<br>um "
-"novo id para ele.<br>De acordo?</html>"
+msgid "<html>To keep your local version, JOSM<br>has to reset the id of primitive {0} to 0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo agree?</html>"
+msgstr "<html>Para manter a versão local, o JOSM<br>precisa resetar o id do primitivo {0} para zero.<br>No próximo envio o servidor irá designar<br>um novo id para ele.<br>De acordo?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
@@ -5289,10 +4805,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
 #, java-format
-msgid ""
-"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
-"dataset.<br>Do you agree?</html>"
-msgstr ""
-"<html> JOSM terá de remover sua primitiva local com id {0} <br> dos dados. "
-"<br> Concorda? </ html>"
+msgid "<html>JOSM will have to remove your local primitive with id {0}<br>from the dataset.<br>Do you agree?</html>"
+msgstr "<html> JOSM terá de remover sua primitiva local com id {0} <br> dos dados. <br> Concorda? </ html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
@@ -5311,7 +4823,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java:121
 msgid "Merged nodes not frozen yet. Cannot build resolution command"
-msgstr ""
-"nós combinados não congelados ainda. Não é possível construir comando de "
-"resolução"
+msgstr "nós combinados não congelados ainda. Não é possível construir comando de resolução"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java:35
@@ -5443,5 +4953,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "todos os números"
@@ -5468,6 +4978,5 @@
 #, java-format
 msgid "All values joined as ''{0}'' are going to be applied for key ''{1}''"
-msgstr ""
-"Todos os valores unidos como \"{0}\" serão aplicados para a chave \"{1}\""
+msgstr "Todos os valores unidos como \"{0}\" serão aplicados para a chave \"{1}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java:100
@@ -5578,10 +5087,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:103
-msgid ""
-"<html>Select to enable entering a tag which will be applied<br>to all "
-"modified relations.</html>"
-msgstr ""
-"<html>Selecione para habilitar a digitação de uma etiqueta que será "
-"aplicada<br>a todas as relações modificadas.</html>"
+msgid "<html>Select to enable entering a tag which will be applied<br>to all modified relations.</html>"
+msgstr "<html>Selecione para habilitar a digitação de uma etiqueta que será aplicada<br>a todas as relações modificadas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:106
@@ -5592,6 +5097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:108
 msgid "<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"
-msgstr ""
-"<html>Digite a chave da tag, ex.: <strong><tt>fixme</tt></strong></html>"
+msgstr "<html>Digite a chave da tag, ex.: <strong><tt>fixme</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:109
@@ -5601,41 +5105,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:111
-msgid ""
-"<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
-msgstr ""
-"<html>Digite o valor da tag, ex.: <strong><tt>verifique os membros</tt></"
-"strong></html>"
+msgid "<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"
+msgstr "<html>Digite o valor da tag, ex.: <strong><tt>verifique os membros</tt></strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:123
-msgid ""
-"<html>The combined ways are members in one ore more relations. Please decide "
-"whether you want to <strong>keep</strong> these memberships for the combined "
-"way or whether you want to <strong>remove</strong> them.<br>The default is "
-"to <strong>keep</strong> the first way and <strong>remove</strong> the other "
-"ways that are members of the same relation: the combined way will take the "
-"place of the original way in the relation.</html>"
-msgstr ""
-"<html>Os caminhos combinados são membros de uma ou mais relações. Por favor "
-"decida se você quer <strong>manter</strong> estas associações para o caminho "
-"combinado ou se você quer <strong>removê-las</strong>.<br>O padrão é "
-"<strong>manter</strong> o primeiro caminho e <strong>remover</strong> os "
-"outros caminhos que são membros da mesma relação: o caminho combinado vai "
-"tomar o lugar do caminho original na relação.</html>"
+msgid "<html>The combined ways are members in one ore more relations. Please decide whether you want to <strong>keep</strong> these memberships for the combined way or whether you want to <strong>remove</strong> them.<br>The default is to <strong>keep</strong> the first way and <strong>remove</strong> the other ways that are members of the same relation: the combined way will take the place of the original way in the relation.</html>"
+msgstr "<html>Os caminhos combinados são membros de uma ou mais relações. Por favor decida se você quer <strong>manter</strong> estas associações para o caminho combinado ou se você quer <strong>removê-las</strong>.<br>O padrão é <strong>manter</strong> o primeiro caminho e <strong>remover</strong> os outros caminhos que são membros da mesma relação: o caminho combinado vai tomar o lugar do caminho original na relação.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:134
-msgid ""
-"<html>The merged nodes are members in one ore more relations. Please decide "
-"whether you want to <strong>keep</strong> these memberships for the target "
-"node or whether you want to <strong>remove</strong> them.<br>The default is "
-"to <strong>keep</strong> the first node and <strong>remove</strong> the "
-"other nodes that are members of the same relation: the target node will take "
-"the place of the original node in the relation.</html>"
-msgstr ""
-"<html>Os nós mesclados são membros de uma ou mais relações. Por gentileza "
-"decida se você quer <strong>manter</strong> estas associações para o nó de "
-"destino, ou se você quer <strong>removê-lo</strong>.<br>O padrão é "
-"<strong>manter</strong> o primeiro nó e <strong>remover</strong> os outros "
-"nós que são membros da mesma relação: o nó de destino vai substituir o nó "
-"original na relação.</html>"
+msgid "<html>The merged nodes are members in one ore more relations. Please decide whether you want to <strong>keep</strong> these memberships for the target node or whether you want to <strong>remove</strong> them.<br>The default is to <strong>keep</strong> the first node and <strong>remove</strong> the other nodes that are members of the same relation: the target node will take the place of the original node in the relation.</html>"
+msgstr "<html>Os nós mesclados são membros de uma ou mais relações. Por gentileza decida se você quer <strong>manter</strong> estas associações para o nó de destino, ou se você quer <strong>removê-lo</strong>.<br>O padrão é <strong>manter</strong> o primeiro nó e <strong>remover</strong> os outros nós que são membros da mesma relação: o nó de destino vai substituir o nó original na relação.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:148
@@ -5653,7 +5130,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:43
 msgid "<html>Please select the values to keep for the following tags.</html>"
-msgstr ""
-"<html>Por favor selecione os valores para manter as seguintes etiquetas.</"
-"html>"
+msgstr "<html>Por favor selecione os valores para manter as seguintes etiquetas.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java:48
@@ -5670,12 +5145,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:162
-msgid ""
-"<html>Select to show changesets for the currently selected objects only."
-"<br>Unselect to show all changesets for objects in the current data layer.</"
-"html>"
-msgstr ""
-"<html>Marque para mostrar os conjuntos de modificações somente para a "
-"seleção atual de objetos.<br>Desmarque para mostrar todos os conjuntos de "
-"modificações para os objetos na camada atual.</html>"
+msgid "<html>Select to show changesets for the currently selected objects only.<br>Unselect to show all changesets for objects in the current data layer.</html>"
+msgstr "<html>Marque para mostrar os conjuntos de modificações somente para a seleção atual de objetos.<br>Desmarque para mostrar todos os conjuntos de modificações para os objetos na camada atual.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:253
@@ -5690,7 +5159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:300
 msgid "Select all objects assigned to the currently selected changesets"
-msgstr ""
-"Selecionar todos os objetos atribuídos aos conjuntos de modificações "
-"selecionados"
+msgstr "Selecionar todos os objetos atribuídos aos conjuntos de modificações selecionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359
@@ -5702,7 +5169,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:360
 msgid "Download information about the selected changesets from the OSM server"
-msgstr ""
-"Baixar informações sobre os conjuntos de modificações selecionados do "
-"servidor OSM"
+msgstr "Baixar informações sobre os conjuntos de modificações selecionados do servidor OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:395
@@ -5725,7 +5190,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:467
 msgid "Opens the Changeset Manager window for the selected changesets"
-msgstr ""
-"Abrir a janela de Gerência de conjuntos de modificações para os conjuntos de "
-"modificações selecionados"
+msgstr "Abrir a janela de Gerência de conjuntos de modificações para os conjuntos de modificações selecionados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30
@@ -5783,9 +5246,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:306
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:108
-msgid ""
-"Set the selected elements on the map to the selected items in the list above."
-msgstr ""
-"Defina os elementos selecionados no mapa para os itens selecionados na lista "
-"acima."
+msgid "Set the selected elements on the map to the selected items in the list above."
+msgstr "Defina os elementos selecionados no mapa para os itens selecionados na lista acima."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:192
@@ -5811,10 +5271,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:241
 #, java-format
-msgid ""
-"<html>You did not finish to merge the differences in this conflict."
-"<br>Conflict resolutions will not be applied unless all differences<br>are "
-"resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> "
-"Already<br>resolved differences will not be applied.</strong><br>Click "
-"<strong>{1}</strong> to return to resolving conflicts.</html>"
+msgid "<html>You did not finish to merge the differences in this conflict.<br>Conflict resolutions will not be applied unless all differences<br>are resolved.<br>Click <strong>{0}</strong> to close anyway.<strong> Already<br>resolved differences will not be applied.</strong><br>Click <strong>{1}</strong> to return to resolving conflicts.</html>"
 msgstr ""
 
@@ -5887,4 +5342,9 @@
 msgstr "Modo Filtro"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5975,5 +5435,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relações"
@@ -6075,15 +5535,13 @@
 msgstr "Seleção: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Desacoplar painel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
-msgid ""
-"Close this panel. You can reopen it with the buttons in the left toolbar."
-msgstr ""
-"Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda."
-
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
+msgid "Close this panel. You can reopen it with the buttons in the left toolbar."
+msgstr "Fechar este painel. Você pode reabri-lo com os botões da barra da esquerda."
+
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Clique para minimizar/maximizar o conteúdo do painel"
@@ -6116,18 +5574,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:203
 #, java-format
-msgid ""
-"Warning: only launching info browsers for the first {0} of {1} selected users"
-msgstr ""
-"Aviso: serão abertos navegadores para os {0} primeiros usuários "
-"selecionados, de um total de {1}"
+msgid "Warning: only launching info browsers for the first {0} of {1} selected users"
+msgstr "Aviso: serão abertos navegadores para os {0} primeiros usuários selecionados, de um total de {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:226
 #, java-format
-msgid ""
-"<html>Failed to create an URL because the encoding ''{0}''<br>was missing on "
-"this system.</html>"
-msgstr ""
-"<html>Falha ao criar a URL pois a codificação ''{0}''<br>não existe no "
-"sistema operacional.</html>"
+msgid "<html>Failed to create an URL because the encoding ''{0}''<br>was missing on this system.</html>"
+msgstr "<html>Falha ao criar a URL pois a codificação ''{0}''<br>não existe no sistema operacional.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:228
@@ -6202,7 +5653,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:450
 msgid "Updates the selected changesets with current data from the OSM server"
-msgstr ""
-"Atualiza os conjuntos de modificações selecionados com dados atuais do "
-"servidor OSM"
+msgstr "Atualiza os conjuntos de modificações selecionados com dados atuais do servidor OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:475
@@ -6212,6 +5661,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:477
 msgid "Download the content of the selected changesets from the server"
-msgstr ""
-"Baixar o conteúdo dos conjuntos de modificações selecionados do servidor"
+msgstr "Baixar o conteúdo dos conjuntos de modificações selecionados do servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:510
@@ -6221,17 +5669,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:512
 msgid "Download my changesets from the OSM server (max. 100 changesets)"
-msgstr ""
-"Baixar meus conjuntos de modificações do servidor do OSM (no máximo 100 "
-"conjuntos)"
+msgstr "Baixar meus conjuntos de modificações do servidor do OSM (no máximo 100 conjuntos)"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:518
-msgid ""
-"<html>JOSM is currently running with an anonymous user. It cannot "
-"download<br>your changesets from the OSM server unless you enter your OSM "
-"user name<br>in the JOSM preferences.</html>"
-msgstr ""
-"<html>O JOSM está atualmente rodando com um usuário anônimo. Ele não vai "
-"baixar<br>seus conjuntos de modificações do servidor do OSM até que você "
-"informe seu nome de usuário<br>nas preferências do JOSM.</html>"
+msgid "<html>JOSM is currently running with an anonymous user. It cannot download<br>your changesets from the OSM server unless you enter your OSM user name<br>in the JOSM preferences.</html>"
+msgstr "<html>O JOSM está atualmente rodando com um usuário anônimo. Ele não vai baixar<br>seus conjuntos de modificações do servidor do OSM até que você informe seu nome de usuário<br>nas preferências do JOSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java:51
@@ -6342,16 +5782,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:386
 #, java-format
-msgid ""
-"<html>The selected object is not available in the current<br>edit layer "
-"''{0}''.</html>"
-msgid_plural ""
-"<html>None of the selected objects is available in the current<br>edit layer "
-"''{0}''.</html>"
-msgstr[0] ""
-"<html>O objeto selecionado não está disponível na camada<br>de edição "
-"''{0}''.</html>"
-msgstr[1] ""
-"<html>Nenhum dos objetos selecionados estão disponíveis na camada<br>de "
-"edição ''{0}''.</html>"
+msgid "<html>The selected object is not available in the current<br>edit layer ''{0}''.</html>"
+msgid_plural "<html>None of the selected objects is available in the current<br>edit layer ''{0}''.</html>"
+msgstr[0] "<html>O objeto selecionado não está disponível na camada<br>de edição ''{0}''.</html>"
+msgstr[1] "<html>Nenhum dos objetos selecionados estão disponíveis na camada<br>de edição ''{0}''.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentPanel.java:331
@@ -6429,4 +5861,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6439,10 +5877,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7107,150 +6539,295 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:378
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:69
-#: build/trans_presets.java:78 build/trans_presets.java:114
-#: build/trans_presets.java:154 build/trans_presets.java:191
-#: build/trans_presets.java:211 build/trans_presets.java:229
-#: build/trans_presets.java:247 build/trans_presets.java:265
-#: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:78
+#: build/trans_presets.java:114
+#: build/trans_presets.java:154
+#: build/trans_presets.java:191
+#: build/trans_presets.java:211
+#: build/trans_presets.java:229
+#: build/trans_presets.java:247
+#: build/trans_presets.java:265
+#: build/trans_presets.java:283
+#: build/trans_presets.java:303
+#: build/trans_presets.java:336
+#: build/trans_presets.java:355
+#: build/trans_presets.java:404
+#: build/trans_presets.java:424
+#: build/trans_presets.java:439
+#: build/trans_presets.java:454
+#: build/trans_presets.java:477
+#: build/trans_presets.java:506
+#: build/trans_presets.java:526
+#: build/trans_presets.java:549
+#: build/trans_presets.java:571
+#: build/trans_presets.java:590
+#: build/trans_presets.java:609
+#: build/trans_presets.java:627
+#: build/trans_presets.java:636
+#: build/trans_presets.java:694
+#: build/trans_presets.java:720
+#: build/trans_presets.java:729
+#: build/trans_presets.java:789
+#: build/trans_presets.java:940
+#: build/trans_presets.java:948
+#: build/trans_presets.java:956
+#: build/trans_presets.java:964
+#: build/trans_presets.java:972
+#: build/trans_presets.java:982
+#: build/trans_presets.java:990
+#: build/trans_presets.java:995
+#: build/trans_presets.java:1002
+#: build/trans_presets.java:1009
+#: build/trans_presets.java:1014
+#: build/trans_presets.java:1022
+#: build/trans_presets.java:1031
+#: build/trans_presets.java:1037
+#: build/trans_presets.java:1043
+#: build/trans_presets.java:1048
+#: build/trans_presets.java:1054
+#: build/trans_presets.java:1060
+#: build/trans_presets.java:1069
+#: build/trans_presets.java:1078
+#: build/trans_presets.java:1085
+#: build/trans_presets.java:1093
+#: build/trans_presets.java:1106
+#: build/trans_presets.java:1112
+#: build/trans_presets.java:1121
+#: build/trans_presets.java:1127
+#: build/trans_presets.java:1133
+#: build/trans_presets.java:1141
+#: build/trans_presets.java:1238
+#: build/trans_presets.java:1289
+#: build/trans_presets.java:1295
+#: build/trans_presets.java:1301
+#: build/trans_presets.java:1307
+#: build/trans_presets.java:1313
+#: build/trans_presets.java:1319
+#: build/trans_presets.java:1332
+#: build/trans_presets.java:1356
+#: build/trans_presets.java:1371
+#: build/trans_presets.java:1377
+#: build/trans_presets.java:1385
+#: build/trans_presets.java:1392
+#: build/trans_presets.java:1401
+#: build/trans_presets.java:1409
+#: build/trans_presets.java:1420
+#: build/trans_presets.java:1430
+#: build/trans_presets.java:1440
+#: build/trans_presets.java:1460
+#: build/trans_presets.java:1472
+#: build/trans_presets.java:1483
+#: build/trans_presets.java:1503
+#: build/trans_presets.java:1512
+#: build/trans_presets.java:1568
+#: build/trans_presets.java:1585
+#: build/trans_presets.java:1592
+#: build/trans_presets.java:1597
+#: build/trans_presets.java:1603
+#: build/trans_presets.java:1609
+#: build/trans_presets.java:1614
+#: build/trans_presets.java:1620
+#: build/trans_presets.java:1626
+#: build/trans_presets.java:1634
+#: build/trans_presets.java:1642
+#: build/trans_presets.java:1650
+#: build/trans_presets.java:1657
+#: build/trans_presets.java:1663
+#: build/trans_presets.java:1670
+#: build/trans_presets.java:1677
+#: build/trans_presets.java:1685
+#: build/trans_presets.java:1692
+#: build/trans_presets.java:1700
+#: build/trans_presets.java:1707
+#: build/trans_presets.java:1713
+#: build/trans_presets.java:1720
+#: build/trans_presets.java:1727
+#: build/trans_presets.java:1734
+#: build/trans_presets.java:1751
+#: build/trans_presets.java:1759
+#: build/trans_presets.java:1774
+#: build/trans_presets.java:1784
+#: build/trans_presets.java:1796
+#: build/trans_presets.java:1803
+#: build/trans_presets.java:1809
+#: build/trans_presets.java:1819
+#: build/trans_presets.java:1824
+#: build/trans_presets.java:1832
+#: build/trans_presets.java:1839
+#: build/trans_presets.java:1845
+#: build/trans_presets.java:1851
+#: build/trans_presets.java:1857
+#: build/trans_presets.java:1862
+#: build/trans_presets.java:1867
+#: build/trans_presets.java:1872
+#: build/trans_presets.java:1879
+#: build/trans_presets.java:1885
+#: build/trans_presets.java:1890
+#: build/trans_presets.java:1899
+#: build/trans_presets.java:1908
+#: build/trans_presets.java:1917
+#: build/trans_presets.java:1926
+#: build/trans_presets.java:1935
+#: build/trans_presets.java:1941
+#: build/trans_presets.java:1949
+#: build/trans_presets.java:1955
+#: build/trans_presets.java:1961
+#: build/trans_presets.java:1967
+#: build/trans_presets.java:1973
+#: build/trans_presets.java:1979
+#: build/trans_presets.java:1985
+#: build/trans_presets.java:1991
+#: build/trans_presets.java:1997
+#: build/trans_presets.java:2003
+#: build/trans_presets.java:2009
+#: build/trans_presets.java:2015
+#: build/trans_presets.java:2021
+#: build/trans_presets.java:2027
+#: build/trans_presets.java:2033
+#: build/trans_presets.java:2040
+#: build/trans_presets.java:2049
+#: build/trans_presets.java:2057
+#: build/trans_presets.java:2063
+#: build/trans_presets.java:2069
+#: build/trans_presets.java:2075
+#: build/trans_presets.java:2081
+#: build/trans_presets.java:2087
+#: build/trans_presets.java:2093
+#: build/trans_presets.java:2099
+#: build/trans_presets.java:2105
+#: build/trans_presets.java:2111
+#: build/trans_presets.java:2117
+#: build/trans_presets.java:2123
+#: build/trans_presets.java:2129
+#: build/trans_presets.java:2135
+#: build/trans_presets.java:2141
+#: build/trans_presets.java:2147
+#: build/trans_presets.java:2153
+#: build/trans_presets.java:2167
+#: build/trans_presets.java:2173
+#: build/trans_presets.java:2179
+#: build/trans_presets.java:2186
+#: build/trans_presets.java:2193
+#: build/trans_presets.java:2201
+#: build/trans_presets.java:2208
+#: build/trans_presets.java:2214
+#: build/trans_presets.java:2221
+#: build/trans_presets.java:2227
+#: build/trans_presets.java:2233
+#: build/trans_presets.java:2239
+#: build/trans_presets.java:2247
+#: build/trans_presets.java:2254
+#: build/trans_presets.java:2261
+#: build/trans_presets.java:2268
+#: build/trans_presets.java:2276
+#: build/trans_presets.java:2308
+#: build/trans_presets.java:2313
+#: build/trans_presets.java:2323
+#: build/trans_presets.java:2328
+#: build/trans_presets.java:2334
+#: build/trans_presets.java:2340
+#: build/trans_presets.java:2357
+#: build/trans_presets.java:2363
+#: build/trans_presets.java:2369
+#: build/trans_presets.java:2375
+#: build/trans_presets.java:2381
+#: build/trans_presets.java:2392
+#: build/trans_presets.java:2399
+#: build/trans_presets.java:2500
+#: build/trans_presets.java:2507
+#: build/trans_presets.java:2528
+#: build/trans_presets.java:2536
+#: build/trans_presets.java:2541
+#: build/trans_presets.java:2547
+#: build/trans_presets.java:2554
+#: build/trans_presets.java:2561
+#: build/trans_presets.java:2567
+#: build/trans_presets.java:2573
+#: build/trans_presets.java:2580
+#: build/trans_presets.java:2587
+#: build/trans_presets.java:2594
+#: build/trans_presets.java:2600
+#: build/trans_presets.java:2607
+#: build/trans_presets.java:2613
+#: build/trans_presets.java:2619
+#: build/trans_presets.java:2625
+#: build/trans_presets.java:2631
+#: build/trans_presets.java:2637
+#: build/trans_presets.java:2644
+#: build/trans_presets.java:2651
+#: build/trans_presets.java:2658
+#: build/trans_presets.java:2664
+#: build/trans_presets.java:2670
+#: build/trans_presets.java:2676
+#: build/trans_presets.java:2682
+#: build/trans_presets.java:2688
+#: build/trans_presets.java:2695
+#: build/trans_presets.java:2702
+#: build/trans_presets.java:2709
+#: build/trans_presets.java:2715
+#: build/trans_presets.java:2721
+#: build/trans_presets.java:2746
+#: build/trans_presets.java:2755
+#: build/trans_presets.java:2770
+#: build/trans_presets.java:2776
+#: build/trans_presets.java:2784
+#: build/trans_presets.java:2791
+#: build/trans_presets.java:2811
+#: build/trans_presets.java:2822
+#: build/trans_presets.java:2828
+#: build/trans_presets.java:2834
+#: build/trans_presets.java:2840
+#: build/trans_presets.java:2846
+#: build/trans_presets.java:2853
+#: build/trans_presets.java:2860
+#: build/trans_presets.java:2867
+#: build/trans_presets.java:2873
+#: build/trans_presets.java:2879
+#: build/trans_presets.java:2887
+#: build/trans_presets.java:2894
+#: build/trans_presets.java:2901
+#: build/trans_presets.java:2908
+#: build/trans_presets.java:2914
+#: build/trans_presets.java:2921
+#: build/trans_presets.java:2928
+#: build/trans_presets.java:2937
+#: build/trans_presets.java:2943
+#: build/trans_presets.java:2949
+#: build/trans_presets.java:2955
+#: build/trans_presets.java:2961
+#: build/trans_presets.java:2970
+#: build/trans_presets.java:2980
+#: build/trans_presets.java:2989
+#: build/trans_presets.java:2995
+#: build/trans_presets.java:3001
+#: build/trans_presets.java:3006
+#: build/trans_presets.java:3012
+#: build/trans_presets.java:3018
+#: build/trans_presets.java:3027
+#: build/trans_presets.java:3033
+#: build/trans_presets.java:3039
+#: build/trans_presets.java:3045
+#: build/trans_presets.java:3051
+#: build/trans_presets.java:3057
+#: build/trans_presets.java:3063
+#: build/trans_presets.java:3070
+#: build/trans_presets.java:3076
+#: build/trans_presets.java:3081
+#: build/trans_presets.java:3088
+#: build/trans_presets.java:3095
+#: build/trans_presets.java:3101
+#: build/trans_presets.java:3110
+#: build/trans_presets.java:3118
+#: build/trans_presets.java:3124
+#: build/trans_presets.java:3130
+#: build/trans_presets.java:3137
+#: build/trans_presets.java:3143
+#: build/trans_presets.java:3150
+#: build/trans_presets.java:3156
+#: build/trans_presets.java:3162
+#: build/trans_presets.java:3168
+#: build/trans_presets.java:3174
+#: build/trans_presets.java:3187
+#: build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nome"
@@ -7282,6 +6859,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:267
 msgid "Remove the changeset in the detail view panel from the local cache"
-msgstr ""
-"Remove os conjuntos de modificações, do painel de detalhes, do cache local"
+msgstr "Remove os conjuntos de modificações, do painel de detalhes, do cache local"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:325
@@ -7290,24 +6866,16 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:358
-msgid ""
-"Select the primitives in the content of this changeset in the current data "
-"layer"
-msgstr ""
-"Seleciona os primitivos do conteúdo deste changeset na camada de dados atual"
+msgid "Select the primitives in the content of this changeset in the current data layer"
+msgstr "Seleciona os primitivos do conteúdo deste changeset na camada de dados atual"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:365
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:434
 #, java-format
-msgid ""
-"<html>None of the objects in the content of changeset {0} is available in "
-"the current<br>edit layer ''{1}''.</html>"
+msgid "<html>None of the objects in the content of changeset {0} is available in the current<br>edit layer ''{1}''.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDetailPanel.java:427
-msgid ""
-"Zoom to the primitives in the content of this changeset in the current data "
-"layer"
-msgstr ""
-"Aproximar dos primitivos do conteúdo deste changeset na camada de dados atual"
+msgid "Zoom to the primitives in the content of this changeset in the current data layer"
+msgstr "Aproximar dos primitivos do conteúdo deste changeset na camada de dados atual"
 
 #. parent for dialog is Main.parent
@@ -7339,15 +6907,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79
-msgid ""
-"Download the changeset with the specified id, including the changeset content"
+msgid "Download the changeset with the specified id, including the changeset content"
 msgstr "Baixar o changeset com com o id informado, incluindo o seu conteúdo"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:141
-msgid ""
-"The current value is not a valid changeset ID. Please enter an integer value "
-"> 0"
-msgstr ""
-"O valor atual não é um ID de conjunto de modificações válido. Por favor "
-"digite um valor inteiro > 0"
+msgid "The current value is not a valid changeset ID. Please enter an integer value > 0"
+msgstr "O valor atual não é um ID de conjunto de modificações válido. Por favor digite um valor inteiro > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143
@@ -7359,24 +6922,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:74
 msgid "Select changesets owned by specific users"
-msgstr ""
-"Selecionar conjuntos de modificações que pertencem a usuários específicos"
+msgstr "Selecionar conjuntos de modificações que pertencem a usuários específicos"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:93
 msgid "Select changesets depending on whether they are open or closed"
-msgstr ""
-"Seleciona conjuntos de modificações independente se estão abertos ou fechados"
+msgstr "Seleciona conjuntos de modificações independente se estão abertos ou fechados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:112
-msgid ""
-"Select changesets based on the date/time they have been created or closed"
-msgstr ""
-"Seleciona conjuntos de modificações baseados na data/hora que foram criados "
-"ou fechados"
+msgid "Select changesets based on the date/time they have been created or closed"
+msgstr "Seleciona conjuntos de modificações baseados na data/hora que foram criados ou fechados"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:132
 msgid "Select only changesets related to a specific bounding box"
-msgstr ""
-"Selecione apenas conjuntos de modificações relacionados com um bounding box "
-"específico"
+msgstr "Selecione apenas conjuntos de modificações relacionados com um bounding box específico"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:302
@@ -7410,12 +6966,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:475
 msgid "Only changesets owned by the user with the following user name"
-msgstr ""
-"Apenas conjuntos de modificações que pertencem ao usuário com o seguinte "
-"nome de usuário"
+msgstr "Apenas conjuntos de modificações que pertencem ao usuário com o seguinte nome de usuário"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:527
-msgid ""
-"Cannot restrict changeset query to the current user because the current user "
-"is anonymous"
+msgid "Cannot restrict changeset query to the current user because the current user is anonymous"
 msgstr ""
 
@@ -7428,7 +6980,5 @@
 #, java-format
 msgid "Cannot restrict the changeset query to the user name ''{0}''"
-msgstr ""
-"Não é possível restringir a pesquisa de conjuntos de modificações para o "
-"nome de usuário \"{0}\""
+msgstr "Não é possível restringir a pesquisa de conjuntos de modificações para o nome de usuário \"{0}\""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:553
@@ -7471,18 +7021,12 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786
 msgid "Only changesets closed after and created before a specific date/time"
-msgstr ""
-"Apenas conjuntos de modificações fechados depois, e criados antes deste dia/"
-"hora"
+msgstr "Apenas conjuntos de modificações fechados depois, e criados antes deste dia/hora"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:837
-msgid ""
-"Cannot build changeset query with time based restrictions. Input is not "
-"valid."
+msgid "Cannot build changeset query with time based restrictions. Input is not valid."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:865
-msgid ""
-"<html>Please enter valid date/time values to restrict<br>the query to a "
-"specific time range.</html>"
+msgid "<html>Please enter valid date/time values to restrict<br>the query to a specific time range.</html>"
 msgstr ""
 
@@ -7492,15 +7036,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:942
-msgid ""
-"Cannot restrict the changeset query to a specific bounding box. The input is "
-"invalid."
-msgstr ""
-"Não é possível restringir a pesquisa de conjuntos de modificações para um "
-"bounding box específico. A entrada é inválida."
+msgid "Cannot restrict the changeset query to a specific bounding box. The input is invalid."
+msgstr "Não é possível restringir a pesquisa de conjuntos de modificações para um bounding box específico. A entrada é inválida."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:951
-msgid ""
-"<html>Please enter valid longitude/latitude values to restrict<br>the "
-"changeset query to a specific bounding box.</html>"
+msgid "<html>Please enter valid longitude/latitude values to restrict<br>the changeset query to a specific bounding box.</html>"
 msgstr ""
 
@@ -7511,13 +7049,9 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:989
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:993
-msgid ""
-"The current value is not a valid user ID. Please enter an integer value > 0"
-msgstr ""
-"O valor atual não é um ID de usuário. Por gentileza digite um inteiro > 0"
+msgid "The current value is not a valid user ID. Please enter an integer value > 0"
+msgstr "O valor atual não é um ID de usuário. Por gentileza digite um inteiro > 0"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1030
-msgid ""
-"<html>The  current value is not a valid user name.<br>Please enter an non-"
-"empty user name.</html>"
+msgid "<html>The  current value is not a valid user name.<br>Please enter an non-empty user name.</html>"
 msgstr ""
 
@@ -7528,14 +7062,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1063
 #, java-format
-msgid ""
-"Please enter a date in the usual format for your locale.<br>Example: {0}"
-"<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Please enter a date in the usual format for your locale.<br>Example: {0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:1127
 #, java-format
-msgid ""
-"Please enter a valid time in the usual format for your locale.<br>Example: "
-"{0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
+msgid "Please enter a valid time in the usual format for your locale.<br>Example: {0}<br>Example: {1}<br>Example: {2}<br>Example: {3}<br>"
 msgstr ""
 
@@ -7545,24 +7075,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:109
-msgid ""
-"<html>Select to restrict the query to your changesets only.<br>Unselect to "
-"include all changesets in the query.</html>"
-msgstr ""
-"<html>Marque para restringir a pesquisa apenas a seus conjuntos de "
-"modificações.<br>Desmarque para incluir todos os conjuntos de modificações "
-"na pesquisa.</html>"
+msgid "<html>Select to restrict the query to your changesets only.<br>Unselect to include all changesets in the query.</html>"
+msgstr "<html>Marque para restringir a pesquisa apenas a seus conjuntos de modificações.<br>Desmarque para incluir todos os conjuntos de modificações na pesquisa.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:126
-msgid ""
-"<html>Please select one the following <strong>standard queries</strong>."
-"Select <strong>Download my changesets only</strong> if you only want to "
-"download changesets created by yourself.<br>Note that JOSM will download "
-"max. 100 changesets.</html>"
-msgstr ""
-"<html>Por gentileza selecione uma destas <strong>consultas-padrão</strong>. "
-"Selecione <strong>Baixar apenas meus conjuntos de modificações</strong> se "
-"você quer baixar os conjuntos de modificações criados por você mesmo."
-"<br>Lembre-se que o JOSM vai baixar no no máximo 100 conjuntos de "
-"modificações.</html>"
+msgid "<html>Please select one the following <strong>standard queries</strong>.Select <strong>Download my changesets only</strong> if you only want to download changesets created by yourself.<br>Note that JOSM will download max. 100 changesets.</html>"
+msgstr "<html>Por gentileza selecione uma destas <strong>consultas-padrão</strong>. Selecione <strong>Baixar apenas meus conjuntos de modificações</strong> se você quer baixar os conjuntos de modificações criados por você mesmo.<br>Lembre-se que o JOSM vai baixar no no máximo 100 conjuntos de modificações.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:147
@@ -7571,11 +7087,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:154
-msgid ""
-"<html>Download my open changesets<br><em>Disabled. Please enter your OSM "
-"user name in the preferences first.</em></html>"
-msgstr ""
-"<html>Baixar meus conjuntos de modificações abertos<br><em>Desabilitado. Por "
-"gentileza, primeiro informe o seu nome de usuário do OSM mas preferências.</"
-"em></html>"
+msgid "<html>Download my open changesets<br><em>Disabled. Please enter your OSM user name in the preferences first.</em></html>"
+msgstr "<html>Baixar meus conjuntos de modificações abertos<br><em>Desabilitado. Por gentileza, primeiro informe o seu nome de usuário do OSM mas preferências.</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:157
@@ -7584,23 +7095,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:165
-msgid ""
-"<html>Download changesets in the current map view.<br><em>Disabled. There is "
-"currently no map view active.</em></html>"
-msgstr ""
-"<html>Baixar os conjuntos de modificações da visualização atual do mapa."
-"<br><em>Desabilitado. Não há nenhum mapa sendo visualizado atualmente.</em></"
-"html>"
+msgid "<html>Download changesets in the current map view.<br><em>Disabled. There is currently no map view active.</em></html>"
+msgstr "<html>Baixar os conjuntos de modificações da visualização atual do mapa.<br><em>Desabilitado. Não há nenhum mapa sendo visualizado atualmente.</em></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:168
 msgid "<html>Download changesets in the current map view</html>"
-msgstr ""
-"<html>Baixar os conjuntos de modificações da visualização atual do mapa</"
-"html>"
+msgstr "<html>Baixar os conjuntos de modificações da visualização atual do mapa</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/BasicChangesetQueryPanel.java:193
 #, java-format
-msgid ""
-"Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to "
-"default query."
+msgid "Warning: unexpected value for preference ''{0}'', got ''{1}''. Resetting to default query."
 msgstr ""
 
@@ -7643,7 +7145,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:171
 msgid "Please enter a valid changeset query URL first."
-msgstr ""
-"Por gentileza digite primeiro a URL válida de uma pesquisa de conjunto de "
-"modificações"
+msgstr "Por gentileza digite primeiro a URL válida de uma pesquisa de conjunto de modificações"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:172
@@ -7674,7 +7174,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70
 msgid "Please enter or paste an URL to retrieve changesets from the OSM API."
-msgstr ""
-"Por favor digite ou cole uma URL para buscar conjuntos de modificações da "
-"API do OSM."
+msgstr "Por favor digite ou cole uma URL para buscar conjuntos de modificações da API do OSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:71
@@ -7684,10 +7182,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:76
 #, java-format
-msgid ""
-"Note that changeset queries are currently always submitted to ''{0}'', "
-"regardless of the host, port and path of the URL entered below."
-msgstr ""
-"Note que as pesquisas de conjuntos de modificações são sempre enviadas para "
-"\"{0}\" , não importa o host, porta ou caminho da URL informada."
+msgid "Note that changeset queries are currently always submitted to ''{0}'', regardless of the host, port and path of the URL entered below."
+msgstr "Note que as pesquisas de conjuntos de modificações são sempre enviadas para \"{0}\" , não importa o host, porta ou caminho da URL informada."
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:174
@@ -7857,7 +7351,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:345
 #, java-format
-msgid ""
-"<html>The child relation<br>{0}<br>is deleted on the server. It cannot be "
-"loaded"
+msgid "<html>The child relation<br>{0}<br>is deleted on the server. It cannot be loaded"
 msgstr ""
 
@@ -7925,8 +7417,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:574
-msgid ""
-"<html>There is at least one member in this relation referring<br>to the "
-"relation itself.<br>This creates circular dependencies and is discouraged."
-"<br>How do you want to proceed with circular dependencies?</html>"
+msgid "<html>There is at least one member in this relation referring<br>to the relation itself.<br>This creates circular dependencies and is discouraged.<br>How do you want to proceed with circular dependencies?</html>"
 msgstr ""
 
@@ -7942,8 +7431,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:604
 #, java-format
-msgid ""
-"<html>This relation already has one or more members referring to<br>the "
-"primitive ''{0}''<br><br>Do you really want to add another relation member?</"
-"html>"
+msgid "<html>This relation already has one or more members referring to<br>the primitive ''{0}''<br><br>Do you really want to add another relation member?</html>"
 msgstr ""
 
@@ -7954,39 +7440,22 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:632
 #, java-format
-msgid ""
-"<html>You are trying to add a relation to itself.<br><br>This creates "
-"circular references and is therefore discouraged.<br>Skipping relation "
-"''{0}''.</html>"
+msgid "<html>You are trying to add a relation to itself.<br><br>This creates circular references and is therefore discouraged.<br>Skipping relation ''{0}''.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:673
-msgid ""
-"Add all primitives selected in the current dataset before the first member"
-msgstr ""
-"Adicionar todas primitivas selecionadas nos dados atuais antes do primeiro "
-"membro"
+msgid "Add all primitives selected in the current dataset before the first member"
+msgstr "Adicionar todas primitivas selecionadas nos dados atuais antes do primeiro membro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:699
-msgid ""
-"Add all primitives selected in the current dataset after the last member"
-msgstr ""
-"Adicionar todas primitivas selecionadas nos dados atuais depois do primeiro "
-"membro"
+msgid "Add all primitives selected in the current dataset after the last member"
+msgstr "Adicionar todas primitivas selecionadas nos dados atuais depois do primeiro membro"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:726
-msgid ""
-"Add all primitives selected in the current dataset before the first selected "
-"member"
-msgstr ""
-"Adicionar todas primitivas selecionadas nos dados atuais antes do primeiro "
-"membro selecionado"
+msgid "Add all primitives selected in the current dataset before the first selected member"
+msgstr "Adicionar todas primitivas selecionadas nos dados atuais antes do primeiro membro selecionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:760
-msgid ""
-"Add all primitives selected in the current dataset after the last selected "
-"member"
-msgstr ""
-"Adicionar todas primitivas selecionadas nos dados atuais depois do primeiro "
-"membro selecionado"
+msgid "Add all primitives selected in the current dataset after the last selected member"
+msgstr "Adicionar todas primitivas selecionadas nos dados atuais depois do primeiro membro selecionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:792
@@ -8001,13 +7470,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:829
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:841
-msgid ""
-"Select relation members which refer to primitives in the current selection"
+msgid "Select relation members which refer to primitives in the current selection"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
 #, java-format
-msgid ""
-"Select relation members which refer to {0} primitives in the current "
-"selection"
+msgid "Select relation members which refer to {0} primitives in the current selection"
 msgstr ""
 
@@ -8073,6 +7539,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1033
 msgid ""
-"One or more members of this new relation have been deleted while the "
-"relation editor\n"
+"One or more members of this new relation have been deleted while the relation editor\n"
 "was open. They have been removed from the relation members list."
 msgstr ""
@@ -8097,15 +7562,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1102
-msgid ""
-"<html>This relation has been changed outside of the editor.<br>You cannot "
-"apply your changes and continue editing.<br><br>Do you want to create a "
-"conflict and close the editor?</html>"
+msgid "<html>This relation has been changed outside of the editor.<br>You cannot apply your changes and continue editing.<br><br>Do you want to create a conflict and close the editor?</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
 #, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''."
-"<br>Please resolve this conflict first, then try again.</html>"
+msgid "<html>Layer ''{0}'' already has a conflict for primitive<br>''{1}''.<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
 
@@ -8265,7 +7725,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java:162
 #, java-format
-msgid ""
-"Warning: ignoring exception because task was cancelled. Exception was: {0}"
-msgstr ""
+msgid "Warning: ignoring exception because task was cancelled. Exception was: {0}"
+msgstr "Aviso: ignorando exceção porque tarefa foi cancelada. A exceção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java:70
@@ -8294,10 +7753,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:154
-msgid ""
-"<html><strong>Current download area</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
-msgstr ""
-"<html><strong>Atual área de download</strong> (minlon, minlat, maxlon, "
-"maxlat): </html>"
+msgid "<html><strong>Current download area</strong> (minlon, minlat, maxlon, maxlat): </html>"
+msgstr "<html><strong>Atual área de download</strong> (minlon, minlat, maxlon, maxlat): </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183
@@ -8310,9 +7765,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192
-msgid ""
-"Currently, there is no download area selected. Please select an area first."
-msgstr ""
-"Atualmente, não há área de download selecionada. Por favor, selecione uma "
-"área primeiro."
+msgid "Currently, there is no download area selected. Please select an area first."
+msgstr "Atualmente, não há área de download selecionada. Por favor, selecione uma área primeiro."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:201
@@ -8351,10 +7803,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:113
-msgid ""
-"URL from www.openstreetmap.org (you can paste an URL here to download the "
-"area)"
-msgstr ""
-"URL do www.openstreetmap.org (você pode colar aqui um link para baixar a "
-"área)"
+msgid "URL from www.openstreetmap.org (you can paste an URL here to download the area)"
+msgstr "URL do www.openstreetmap.org (você pode colar aqui um link para baixar a área)"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:145
@@ -8396,6 +7844,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:99
 msgid "Select to download OSM data in the selected download area."
-msgstr ""
-"Selecione para baixar dados do OSM para a área de download selecionada."
+msgstr "Selecione para baixar dados do OSM para a área de download selecionada."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:101
@@ -8405,6 +7852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:102
 msgid "Select to download GPS traces in the selected download area."
-msgstr ""
-"Selecione para baixar trilhas GPS do OSM para a área de download selecionada."
+msgstr "Selecione para baixar trilhas GPS do OSM para a área de download selecionada."
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:133
@@ -8413,7 +7859,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:134
-msgid ""
-"<html>Select to download data into a new data layer.<br>Unselect to download "
-"into the currently active data layer.</html>"
+msgid "<html>Select to download data into a new data layer.<br>Unselect to download into the currently active data layer.</html>"
 msgstr ""
 
@@ -8424,7 +7868,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:222
 msgid "Download area too large; will probably be rejected by server"
-msgstr ""
-"Área para baixar é muito grande; pedido provavelmente será rejeitado pelo "
-"servidor"
+msgstr "Área para baixar é muito grande; pedido provavelmente será rejeitado pelo servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:225
@@ -8446,7 +7888,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:411
 #, java-format
-msgid ""
-"<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled."
-"<br>Please chose to either download OSM data, or GPX data, or both.</html>"
+msgid "<html>Neither <strong>{0}</strong> nor <strong>{1}</strong> is enabled.<br>Please chose to either download OSM data, or GPX data, or both.</html>"
 msgstr ""
 
@@ -8523,10 +7963,16 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402
+#: build/trans_presets.java:660
+#: build/trans_presets.java:669
+#: build/trans_presets.java:1032
+#: build/trans_presets.java:1358
+#: build/trans_presets.java:2348
+#: build/trans_presets.java:2382
+#: build/trans_presets.java:2391
+#: build/trans_presets.java:2417
+#: build/trans_presets.java:2971
+#: build/trans_presets.java:2981
+#: build/trans_presets.java:2990
 msgid "Type"
 msgstr "Tipo"
@@ -8534,5 +7980,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8546,17 +7991,28 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_presets.java:490
+#: build/trans_presets.java:533
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1269
+#: build/trans_presets.java:1363
+#: build/trans_presets.java:1364
+#: build/trans_presets.java:1365
+#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
+#: build/trans_presets.java:2493
 msgid "unknown"
 msgstr "Desconhecido"
@@ -8581,28 +8037,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:225
 #, java-format
-msgid ""
-"<html><p class=\"warning-header\">Help content for help topic missing</p><p "
-"class=\"warning-body\">Help content for the help topic <strong>{0}</strong> "
-"is not available yet. It is missing both in your local language ({1}) and in "
-"english.<br><br>Please help to improve the JOSM help system and fill in the "
-"missing information. You can both edit the <a href=\"{2}\">help topic in "
-"your local language ({1})</a> and the <a href=\"{3}\">help topic in english</"
-"a>.</p></html>"
+msgid "<html><p class=\"warning-header\">Help content for help topic missing</p><p class=\"warning-body\">Help content for the help topic <strong>{0}</strong> is not available yet. It is missing both in your local language ({1}) and in english.<br><br>Please help to improve the JOSM help system and fill in the missing information. You can both edit the <a href=\"{2}\">help topic in your local language ({1})</a> and the <a href=\"{3}\">help topic in english</a>.</p></html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:247
 #, java-format
-msgid ""
-"<html><p class=\"error-header\">Error when retrieving help information</p><p "
-"class=\"error-body\">The content for the help topic <strong>{0}</strong> "
-"could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></"
-"p></html>"
+msgid "<html><p class=\"error-header\">Error when retrieving help information</p><p class=\"error-body\">The content for the help topic <strong>{0}</strong> could not be loaded. The error message is (untranslated):<br><tt>{1}</tt></p></html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:355
 #, java-format
-msgid ""
-"<html>Failed to open help page for url {0}.<br>This is most likely due to a "
-"network problem, please check<br>your internet connection</html>"
+msgid "<html>Failed to open help page for url {0}.<br>This is most likely due to a network problem, please check<br>your internet connection</html>"
 msgstr ""
 
@@ -8623,7 +8066,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
 #, java-format
-msgid ""
-"<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only "
-"possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
+msgid "<html>The current URL <tt>{0}</tt><br>is an external URL. Editing is only possible for help topics<br>on the help server <tt>{1}</tt>.</html>"
 msgstr ""
 
@@ -8651,5 +8092,5 @@
 #, java-format
 msgid "Warning: bad location in HTML document. Exception was: {0}"
-msgstr ""
+msgstr "Aviso: localização ruim no documento HTML. A exceção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:569
@@ -8694,22 +8135,16 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272
 msgid "History not initialized yet. Failed to set reference primitive."
-msgstr ""
-"histórico não foi inicializado ainda. Falha ao definir primitiva de "
-"referência."
+msgstr "histórico não foi inicializado ainda. Falha ao definir primitiva de referência."
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:274
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:304
 #, java-format
-msgid ""
-"Failed to set reference. Reference ID {0} does not match history ID {1}."
+msgid "Failed to set reference. Reference ID {0} does not match history ID {1}."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:277
 #, java-format
-msgid ""
-"Failed to set reference. Reference version {0} not available in history."
-msgstr ""
-"Falha ao difinir referência. Versão de referência {0}  dnão disponível no "
-"histórico"
+msgid "Failed to set reference. Reference version {0} not available in history."
+msgstr "Falha ao difinir referência. Versão de referência {0}  dnão disponível no histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:302
@@ -8719,9 +8154,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:307
 #, java-format
-msgid ""
-"Failed to set current primitive. Current version {0} not available in "
-"history."
-msgstr ""
-"Falha ao definir atual. Versão atual {0} não está disponível no histórico"
+msgid "Failed to set current primitive. Current version {0} not available in history."
+msgstr "Falha ao definir atual. Versão atual {0} não está disponível no histórico"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:55
@@ -8784,14 +8216,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:92
 #, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
+msgid "<html>Version <strong>{0}</strong> currently edited in layer ''{1}''</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:98
 #, java-format
-msgid ""
-"<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
-msgstr ""
-"<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
+msgid "<html>Version <strong>{0}</strong> created on <strong>{1}</strong></html>"
+msgstr "<html>Versão <strong>{0}</strong> criada em <strong>{1}</strong></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionTable.java:119
@@ -8838,13 +8267,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62
 #, java-format
-msgid ""
-"Failed to update primitive with id {0} because current edit layer is null"
+msgid "Failed to update primitive with id {0} because current edit layer is null"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:65
 #, java-format
-msgid ""
-"Failed to update primitive with id {0} because current edit layer does not "
-"include such a primitive"
+msgid "Failed to update primitive with id {0} because current edit layer does not include such a primitive"
 msgstr ""
 
@@ -8871,20 +8297,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:118
 #, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
-"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
-"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
-"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
-"strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{6}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de "
-"um <br>de seus nós, caminhos ou relações.<br>Este conflito é causado pelo(a) "
-"<strong>{0}</strong> com id <strong>{1}</strong>.<br>O servidor tem a versão "
-"{2}, e sua versão é {3}.<br><br>Clique <strong>{4}</strong> para sincronizar "
-"somente a primitiva conflitante.<br>Clique <strong>{5}</strong> para "
-"sincronizar todo o conjunto de dados locais no servidor<br>Clique <strong>{6}"
-"</strong> para abortar e continuar editando.<br></html>"
+msgid "<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>of your nodes, ways, or relations.<br>The conflict is caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the server has version {2}, your version is {3}.<br><br>Click <strong>{4}</strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</strong> to synchronize the entire local dataset with the server.<br>Click <strong>{6}</strong> to abort and continue editing.<br></html>"
+msgstr "<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de um <br>de seus nós, caminhos ou relações.<br>Este conflito é causado pelo(a) <strong>{0}</strong> com id <strong>{1}</strong>.<br>O servidor tem a versão {2}, e sua versão é {3}.<br><br>Clique <strong>{4}</strong> para sincronizar somente a primitiva conflitante.<br>Clique <strong>{5}</strong> para sincronizar todo o conjunto de dados locais no servidor<br>Clique <strong>{6}</strong> para abortar e continuar editando.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:132
@@ -8896,25 +8308,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:166
 #, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because the server has a newer "
-"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
-"</strong> to synchronize the entire local dataset with the server.<br>Click "
-"<strong>{1}</strong> to abort and continue editing.<br></html>"
-msgstr ""
-"<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de "
-"um<br> de seus nós, caminhos ou relações..<br><br>Clique <strong>{0}</"
-"strong> para sincronizar todos o conjuntos de dados locais com o servidor."
-"<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
+msgid "<html>Uploading <strong>failed</strong> because the server has a newer version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}</strong> to synchronize the entire local dataset with the server.<br>Click <strong>{1}</strong> to abort and continue editing.<br></html>"
+msgstr "<html>Envio <strong>falhou</strong> porque o servidor tem uma nova versão de um<br> de seus nós, caminhos ou relações..<br><br>Clique <strong>{0}</strong> para sincronizar todos o conjuntos de dados locais com o servidor.<br>Clique <strong>{1}</strong> para abortar e continuar editando.<br></html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:194
 #, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because you have been "
-"using<br>changeset {0} which was already closed at {1}.<br>Please upload "
-"again with a new or an existing open changeset.</html>"
-msgstr ""
-"<html>O envio <strong>falhou</strong> porque você está usando<br>o changeset "
-"{0} que já foi fechado em {1}.<br>Por favor envie novamente em um changeset "
-"novo ou aberto.</html>"
+msgid "<html>Uploading <strong>failed</strong> because you have been using<br>changeset {0} which was already closed at {1}.<br>Please upload again with a new or an existing open changeset.</html>"
+msgstr "<html>O envio <strong>falhou</strong> porque você está usando<br>o changeset {0} que já foi fechado em {1}.<br>Por favor envie novamente em um changeset novo ou aberto.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:202
@@ -8937,15 +8335,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:226
 #, java-format
-msgid ""
-"<html>Uploading <strong>failed</strong> because you tried to delete node {0} "
-"which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to "
-"download all parent ways of node {0}.<br>If necessary JOSM will create "
-"conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
-msgstr ""
-"<html>O envio de dados <strong>falhou</strong> porque você tentou apagar o "
-"nó {0} que ainda é usado pela via {1}.<br><br>Clique <strong>{2}</strong> "
-"para baixar todas as vias que contém o nó {0}.<br>Se for necessário o JOSM "
-"criará conflitos que você poderá resolver através da Janela de Resolução de "
-"Conflitos.</html>"
+msgid "<html>Uploading <strong>failed</strong> because you tried to delete node {0} which is still in use in way {1}.<br><br>Click <strong>{2}</strong> to download all parent ways of node {0}.<br>If necessary JOSM will create conflicts which you can resolve in the Conflict Resolution Dialog.</html>"
+msgstr "<html>O envio de dados <strong>falhou</strong> porque você tentou apagar o nó {0} que ainda é usado pela via {1}.<br><br>Clique <strong>{2}</strong> para baixar todas as vias que contém o nó {0}.<br>Se for necessário o JOSM criará conflitos que você poderá resolver através da Janela de Resolução de Conflitos.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:237
@@ -8984,7 +8373,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:80
-msgid ""
-"Please decide what changeset the data is uploaded to and whether to close "
-"the changeset after the next upload."
+msgid "Please decide what changeset the data is uploaded to and whether to close the changeset after the next upload."
 msgstr ""
 
@@ -9028,7 +8415,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:55
 msgid "<html>Please select the changesets you want to close</html>"
-msgstr ""
-"<html>Por favor selecione os conjuntos de modificações que você quer fechar</"
-"html>"
+msgstr "<html>Por favor selecione os conjuntos de modificações que você quer fechar</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java:88
@@ -9058,8 +8443,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:99
-msgid ""
-"Warning: failed to put Credential Dialog always on top. Caught security "
-"exception."
-msgstr ""
+msgid "Warning: failed to put Credential Dialog always on top. Caught security exception."
+msgstr "Aviso: falha ao colocar a janela de Credenciais no topo das outras janelas. Foi capturada uma exceção de segurança."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:105
@@ -9085,7 +8468,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:240
 #, java-format
-msgid ""
-"Authenticating at the OSM API ''{0}'' failed. Please enter a valid username "
-"and a valid password."
+msgid "Authenticating at the OSM API ''{0}'' failed. Please enter a valid username and a valid password."
 msgstr ""
 
@@ -9096,6 +8477,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:254
 msgid "Please enter the user name for authenticating at your proxy server"
-msgstr ""
-"Por favor, entre o nome de usuário para autenticação no seu servidor proxy"
+msgstr "Por favor, entre o nome de usuário para autenticação no seu servidor proxy"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:255
@@ -9105,18 +8485,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:257
 #, java-format
-msgid ""
-"Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid "
-"username and a valid password."
-msgstr ""
-"Autenticação no Proxy HTTP \"{0}\" falhou. Por favor, entre com nome e senha "
-"de usuário válidos."
+msgid "Authenticating at the HTTP proxy ''{0}'' failed. Please enter a valid username and a valid password."
+msgstr "Autenticação no Proxy HTTP \"{0}\" falhou. Por favor, entre com nome e senha de usuário válidos."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:259
-msgid ""
-"Warning: depending on the authentication method the proxy server uses the "
-"password may be transferred unencrypted."
-msgstr ""
-"Aviso: dependendo do método de autenticação do servidor proxy sua senha pode "
-"ser enviada sem encriptação."
+msgid "Warning: depending on the authentication method the proxy server uses the password may be transferred unencrypted."
+msgstr "Aviso: dependendo do método de autenticação do servidor proxy sua senha pode ser enviada sem encriptação."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/CredentialDialog.java:279
@@ -9133,14 +8505,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:63
-msgid ""
-"Could not retrieve the list of your open changesets because<br>JOSM does not "
-"know your identity.<br>You have either chosen to work anonymously or you are "
-"not entitled<br>to know the identity of the user on whose behalf you are "
-"working."
-msgstr ""
-"Não foi possível receber a lista com seus conjuntos de modificações abertos "
-"porque<br>o JOSM não sabe qual é a sua identidade.<br>Você pode ter "
-"escolhido trabalhar de forma anônima ou você não tem o direito<br>de saber a "
-"identidade do usuário em cujo nome você está trabalhando."
+msgid "Could not retrieve the list of your open changesets because<br>JOSM does not know your identity.<br>You have either chosen to work anonymously or you are not entitled<br>to know the identity of the user on whose behalf you are working."
+msgstr "Não foi possível receber a lista com seus conjuntos de modificações abertos porque<br>o JOSM não sabe qual é a sua identidade.<br>Você pode ter escolhido trabalhar de forma anônima ou você não tem o direito<br>de saber a identidade do usuário em cujo nome você está trabalhando."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:68
@@ -9150,10 +8514,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java:120
 #, java-format
-msgid ""
-"Warning: Failed to retrieve user infos for the current JOSM user. Exception "
-"was: {0}"
-msgstr ""
-"Aviso: Falha ao buscar informações sobre o usuário JOSM atual. A exceção "
-"foi: {0}"
+msgid "Warning: Failed to retrieve user infos for the current JOSM user. Exception was: {0}"
+msgstr "Aviso: Falha ao buscar informações sobre o usuário JOSM atual. A exceção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java:140
@@ -9174,6 +8534,5 @@
 #, java-format
 msgid "Layer ''{0}'' has modifications which should be uploaded to the server."
-msgstr ""
-"A camada ''{0}'' tem modificações que deveriam ser enviadas ao servidor."
+msgstr "A camada ''{0}'' tem modificações que deveriam ser enviadas ao servidor."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:49
@@ -9184,10 +8543,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:60
 #, java-format
-msgid ""
-"Layer ''{0}'' has modifications which should be saved to its associated file "
-"''{1}''."
-msgstr ""
-"A camada ''{0}'' tem modificações que deveriam ser salvas no seu arquivo "
-"associado \"{1}\"."
+msgid "Layer ''{0}'' has modifications which should be saved to its associated file ''{1}''."
+msgstr "A camada ''{0}'' tem modificações que deveriam ser salvas no seu arquivo associado \"{1}\"."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:62
@@ -9212,6 +8567,5 @@
 #, java-format
 msgid "File ''{0}'' is not writable. Please enter another file name."
-msgstr ""
-"Arquivo ''{0}'' não é gravável. Por favor, entre com outro nome de arquivo."
+msgstr "Arquivo ''{0}'' não é gravável. Por favor, entre com outro nome de arquivo."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:109
@@ -9240,10 +8594,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:195
 #, java-format
-msgid ""
-"<html>{0} layer has unresolved conflicts.<br>Either resolve them first or "
-"discard the modifications.<br>Layer with conflicts:</html>"
-msgid_plural ""
-"<html>{0} layers have unresolved conflicts.<br>Either resolve them first or "
-"discard the modifications.<br>Layers with conflicts:</html>"
+msgid "<html>{0} layer has unresolved conflicts.<br>Either resolve them first or discard the modifications.<br>Layer with conflicts:</html>"
+msgid_plural "<html>{0} layers have unresolved conflicts.<br>Either resolve them first or discard the modifications.<br>Layers with conflicts:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9255,11 +8605,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:213
 #, java-format
-msgid ""
-"<html>{0} layer needs saving but has no associated file.<br>Either select a "
-"file for this layer or discard the changes.<br>Layer without a file:</html>"
-msgid_plural ""
-"<html>{0} layers need saving but have no associated file.<br>Either select a "
-"file for each of them or discard the changes.<br>Layers without a file:</"
-"html>"
+msgid "<html>{0} layer needs saving but has no associated file.<br>Either select a file for this layer or discard the changes.<br>Layer without a file:</html>"
+msgid_plural "<html>{0} layers need saving but have no associated file.<br>Either select a file for each of them or discard the changes.<br>Layers without a file:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9271,12 +8616,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:231
 #, java-format
-msgid ""
-"<html>{0} layer needs saving but has an associated file<br>which cannot be "
-"written.<br>Either select another file for this layer or discard the changes."
-"<br>Layer with a non-writable file:</html>"
-msgid_plural ""
-"<html>{0} layers need saving but have associated files<br>which cannot be "
-"written.<br>Either select another file for each of them or discard the "
-"changes.<br>Layers with non-writable files:</html>"
+msgid "<html>{0} layer needs saving but has an associated file<br>which cannot be written.<br>Either select another file for this layer or discard the changes.<br>Layer with a non-writable file:</html>"
+msgid_plural "<html>{0} layers need saving but have associated files<br>which cannot be written.<br>Either select another file for each of them or discard the changes.<br>Layers with non-writable files:</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9304,6 +8643,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:324
 msgid "Delete layers without saving. Unsaved changes are lost."
-msgstr ""
-"Remove as camadas sem salvar. Todas as mudanças não-salvas são perdidas."
+msgstr "Remove as camadas sem salvar. Todas as mudanças não-salvas são perdidas."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:349
@@ -9321,6 +8659,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:356
 msgid "Save/Upload layers before deleting. Unsaved changes are not lost."
-msgstr ""
-"Salvar/Enviar camadas antes de apagar. Dados não salvos não serão perdidos."
+msgstr "Salvar/Enviar camadas antes de apagar. Dados não salvos não serão perdidos."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:403
@@ -9331,10 +8668,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:490
 #, java-format
-msgid ""
-"<html>An upload and/or save operation of one layer with modifications<br>was "
-"cancelled or has failed.</html>"
-msgid_plural ""
-"<html>Upload and/or save operations of {0} layers with modifications<br>were "
-"cancelled or have failed.</html>"
+msgid "<html>An upload and/or save operation of one layer with modifications<br>was cancelled or has failed.</html>"
+msgid_plural "<html>Upload and/or save operations of {0} layers with modifications<br>were cancelled or have failed.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -9365,11 +8698,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9380,20 +8715,36 @@
 #. item "Transport/Railway/Bus Guideway" check "Embankment"
 #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java:20
-#: build/trans_presets.java:79 build/trans_presets.java:96
-#: build/trans_presets.java:115 build/trans_presets.java:134
-#: build/trans_presets.java:155 build/trans_presets.java:171
-#: build/trans_presets.java:192 build/trans_presets.java:212
-#: build/trans_presets.java:236 build/trans_presets.java:254
-#: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:79
+#: build/trans_presets.java:96
+#: build/trans_presets.java:115
+#: build/trans_presets.java:134
+#: build/trans_presets.java:155
+#: build/trans_presets.java:171
+#: build/trans_presets.java:192
+#: build/trans_presets.java:212
+#: build/trans_presets.java:236
+#: build/trans_presets.java:254
+#: build/trans_presets.java:272
+#: build/trans_presets.java:290
+#: build/trans_presets.java:310
+#: build/trans_presets.java:342
+#: build/trans_presets.java:361
+#: build/trans_presets.java:410
+#: build/trans_presets.java:425
+#: build/trans_presets.java:440
+#: build/trans_presets.java:463
+#: build/trans_presets.java:494
+#: build/trans_presets.java:513
+#: build/trans_presets.java:534
+#: build/trans_presets.java:556
+#: build/trans_presets.java:579
+#: build/trans_presets.java:597
+#: build/trans_presets.java:616
+#: build/trans_presets.java:949
+#: build/trans_presets.java:957
+#: build/trans_presets.java:965
+#: build/trans_presets.java:973
+#: build/trans_presets.java:983
+#: build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Layer"
@@ -9452,7 +8803,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:129
 msgid "Manage open changesets and select a changeset to upload to"
-msgstr ""
-"Gerenciar conjuntos de modificações abertos e selecionar um conjuntos de "
-"modificações para enviar os dados"
+msgstr "Gerenciar conjuntos de modificações abertos e selecionar um conjuntos de modificações para enviar os dados"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:133
@@ -9476,7 +8825,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:363
 msgid "Please enter a comment for this upload changeset (min. 3 characters)"
-msgstr ""
-"Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 "
-"caracteres)"
+msgstr "Por gentile digite um comentário para este conjunto de mudanças (mínomo 3 caracteres)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:364
@@ -9505,7 +8852,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java:94
 #, java-format
-msgid ""
-"Warning: primitive ''{0}'' is already deleted on the server. Skipping this "
-"primitive and retrying to upload."
+msgid "Warning: primitive ''{0}'' is already deleted on the server. Skipping this primitive and retrying to upload."
 msgstr ""
 
@@ -9520,7 +8865,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:48
 #, java-format
-msgid ""
-"Objects are uploaded to the <strong>open changeset</strong> {0} with upload "
-"comment ''{1}''."
+msgid "Objects are uploaded to the <strong>open changeset</strong> {0} with upload comment ''{1}''."
 msgstr ""
 
@@ -9540,34 +8883,19 @@
 #, java-format
 msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong>"
-msgid_plural ""
-"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
-msgstr[0] ""
-"Enviando <strong>{0} objeto</strong> para <strong>1 changeset</strong>"
-msgstr[1] ""
-"Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong>"
+msgid_plural "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong>"
+msgstr[0] "Enviando <strong>{0} objeto</strong> para <strong>1 changeset</strong>"
+msgstr[1] "Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:87
 #, java-format
-msgid ""
-"Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using "
-"<strong>1 request</strong>"
-msgid_plural ""
-"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
-"<strong>1 request</strong>"
-msgstr[0] ""
-"Enviando <strong>{0} objeto</strong> para <strong>1 changeset</strong> "
-"usando <strong>1 requisição</strong>"
-msgstr[1] ""
-"Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong> "
-"usando <strong>1 requisição</strong>"
+msgid "Uploading <strong>{0} object</strong> to <strong>1 changeset</strong> using <strong>1 request</strong>"
+msgid_plural "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using <strong>1 request</strong>"
+msgstr[0] "Enviando <strong>{0} objeto</strong> para <strong>1 changeset</strong> usando <strong>1 requisição</strong>"
+msgstr[1] "Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong> usando <strong>1 requisição</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:92
 #, java-format
-msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using "
-"<strong>{1} requests</strong>"
-msgstr ""
-"Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong> "
-"usando <strong>{1} requisições</strong>"
+msgid "Uploading <strong>{0} objects</strong> to <strong>1 changeset</strong> using <strong>{1} requests</strong>"
+msgstr "Enviando <strong>{0} objetos</strong> para <strong>1 changeset</strong> usando <strong>{1} requisições</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:94
@@ -9578,22 +8906,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:98
 #, java-format
-msgid ""
-"{0} objects exceed the max. allowed {1} objects in a changeset on the server "
-"''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to "
-"proceed with <strong>multiple changesets</strong>"
-msgstr ""
-"{0} objetos excedem o máximo permitido de {1} objetos em um conjuntos de "
-"modificações no servidor ''{2}''. Por favor <a href=\"urn:advanced-"
-"configuration\">configure</a> como proceder com <strong>múltiplos conjuntos "
-"de modificações</strong>"
+msgid "{0} objects exceed the max. allowed {1} objects in a changeset on the server ''{2}''. Please <a href=\"urn:advanced-configuration\">configure</a> how to proceed with <strong>multiple changesets</strong>"
+msgstr "{0} objetos excedem o máximo permitido de {1} objetos em um conjuntos de modificações no servidor ''{2}''. Por favor <a href=\"urn:advanced-configuration\">configure</a> como proceder com <strong>múltiplos conjuntos de modificações</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadParameterSummaryPanel.java:101
 #, java-format
-msgid ""
-"Uploading <strong>{0} objects</strong> to <strong>multiple changesets</"
-"strong> using <strong>{1} requests</strong>"
-msgstr ""
-"Enviando <strong>{0} objetos</strong> para <strong>vários conjuntos de "
-"modificações</strong> usando <strong>{1} requisições</strong>"
+msgid "Uploading <strong>{0} objects</strong> to <strong>multiple changesets</strong> using <strong>{1} requests</strong>"
+msgstr "Enviando <strong>{0} objetos</strong> para <strong>vários conjuntos de modificações</strong> usando <strong>{1} requisições</strong>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:67
@@ -9609,7 +8926,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:83
 msgid "Click to continue uploading to additional new changesets"
-msgstr ""
-"Clique para continuar enviando para os novos conjuntos de modificações "
-"adicionais"
+msgstr "Clique para continuar enviando para os novos conjuntos de modificações adicionais"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:87
@@ -9631,8 +8946,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:100
 #, java-format
-msgid ""
-"The server reported that the current changeset was closed.<br>This is most "
-"likely because the changesets size exceeded the max. size<br>of {0} objects "
-"on the server ''{1}''."
+msgid "The server reported that the current changeset was closed.<br>This is most likely because the changesets size exceeded the max. size<br>of {0} objects on the server ''{1}''."
 msgstr ""
 
@@ -9646,14 +8958,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:113
 #, java-format
-msgid ""
-"Click ''<strong>{0}</strong>'' to continue uploading to additional new "
-"changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog."
-"<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map "
-"editing.<br>"
-msgstr ""
-"Clique ''<strong>{0}</strong>'' para continuar enviando para conjuntos de "
-"modificações adicionais.<br>Clique ''<strong>{1}</strong>''para voltar à "
-"janela de envio.<br>Clique ''<strong>{2}</strong>'' para cancelar o envio e "
-"voltar à edição do mapa.<br>"
+msgid "Click ''<strong>{0}</strong>'' to continue uploading to additional new changesets.<br>Click ''<strong>{1}</strong>'' to return to the upload dialog.<br>Click ''<strong>{2}</strong>'' to abort uploading and return to map editing.<br>"
+msgstr "Clique ''<strong>{0}</strong>'' para continuar enviando para conjuntos de modificações adicionais.<br>Clique ''<strong>{1}</strong>''para voltar à janela de envio.<br>Clique ''<strong>{2}</strong>'' para cancelar o envio e voltar à edição do mapa.<br>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:124
@@ -9665,16 +8969,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:194
 #, java-format
-msgid ""
-"Warning: object ''{0}'' is already deleted on the server. Skipping this "
-"object and retrying to upload."
-msgstr ""
-"Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e "
-"tentando novamente o envio de dados."
+msgid "Warning: object ''{0}'' is already deleted on the server. Skipping this object and retrying to upload."
+msgstr "Aviso: objeto \"{0}\" já foi apagado no servidor. Ignorando esse objeto e tentando novamente o envio de dados."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:195
 #, java-format
 msgid "Object ''{0}'' is already deleted. Skipping object in upload."
-msgstr ""
-"Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados."
+msgstr "Objeto \"{0}\" já foi apagado. Ignorando esse objeto no envio de dados."
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java:233
@@ -9686,18 +8985,12 @@
 #, java-format
 msgid "Ignoring caught exception because upload is canceled. Exception is: {0}"
-msgstr ""
-"Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é "
-"{0}"
+msgstr "Ignorando exceção capturada porque o envio de dados foi cancelado. Exceção é {0}"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:60
-msgid ""
-"<html>Mark modified objects <strong>from the current selection</strong> to "
-"be uploaded to the server.</html>"
+msgid "<html>Mark modified objects <strong>from the current selection</strong> to be uploaded to the server.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java:70
-msgid ""
-"<html>Mark <strong>locally deleted objects</strong> to be deleted on the "
-"server.</html>"
+msgid "<html>Mark <strong>locally deleted objects</strong> to be deleted on the server.</html>"
 msgstr ""
 
@@ -9713,6 +9006,5 @@
 #, java-format
 msgid "Warning: unexpected value for key ''{0}'' in preferences, got ''{1}''"
-msgstr ""
-"Aviso: valor inesperado para chave ''{0}'' em preferências, obtido ''{1}''"
+msgstr "Aviso: valor inesperado para chave ''{0}'' em preferências, obtido ''{1}''"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:94
@@ -9735,10 +9027,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:189
 #, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. Which strategy do you want to use?</html>"
-msgstr ""
-"<html>Será necessário <strong>múltiplos conjuntos de modificações</strong> "
-"para poder enviar {0} objetos. Qual estratégia você deseja utilizar?</html>"
+msgid "<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. Which strategy do you want to use?</html>"
+msgstr "<html>Será necessário <strong>múltiplos conjuntos de modificações</strong> para poder enviar {0} objetos. Qual estratégia você deseja utilizar?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:191
@@ -9748,30 +9036,19 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:193
 msgid "Open and use as many new changesets as necessary"
-msgstr ""
-"Abrir e usar tantos conjuntos de modificações quantos forem necessários"
+msgstr "Abrir e usar tantos conjuntos de modificações quantos forem necessários"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:323
 msgid "Upload in one request not possible (too many objects to upload)"
-msgstr ""
-"Envio em apenas uma requisição não foi possível: muitos objetos a serem "
-"enviados"
+msgstr "Envio em apenas uma requisição não foi possível: muitos objetos a serem enviados"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324
 #, java-format
-msgid ""
-"<html>Cannot upload {0} objects in one request because the<br>max. changeset "
-"size {1} on server ''{2}'' is exceeded.</html>"
-msgstr ""
-"<html>Não foi possível enviar {0} objetos em somente uma requisição porque o "
-"<br>tamanho máximo ({1}) no servidor \"{2}\" foi excedido</html>"
+msgid "<html>Cannot upload {0} objects in one request because the<br>max. changeset size {1} on server ''{2}'' is exceeded.</html>"
+msgstr "<html>Não foi possível enviar {0} objetos em somente uma requisição porque o <br>tamanho máximo ({1}) no servidor \"{2}\" foi excedido</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:334
 #, java-format
-msgid ""
-"<html>There are <strong>multiple changesets</strong> necessary in order to "
-"upload {0} objects. What strategy do you want to use?</html>"
-msgstr ""
-"<html>Será necessário <strong>múltiplos conjuntos de modificações</strong> "
-"para enviar {0}objetos. Qual estratégia você quer usar?</html>"
+msgid "<html>There are <strong>multiple changesets</strong> necessary in order to upload {0} objects. What strategy do you want to use?</html>"
+msgstr "<html>Será necessário <strong>múltiplos conjuntos de modificações</strong> para enviar {0}objetos. Qual estratégia você quer usar?</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:351
@@ -9784,5 +9061,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:362
 msgid "(# requests unknown)"
-msgstr "{# requisições desconhecidas)"
+msgstr "(# requisições desconhecidas)"
 
 #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:357
@@ -9911,8 +9188,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:221
 #, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with audio data.</html>"
+msgid "<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>Because its way points do not include a timestamp we cannot correlate them with audio data.</html>"
 msgstr ""
 
@@ -9937,8 +9211,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:304
 #, java-format
-msgid ""
-"<html>The data in the GPX layer ''{0}'' has been downloaded from the server."
-"<br>Because its way points do not include a timestamp we cannot correlate "
-"them with images.</html>"
+msgid "<html>The data in the GPX layer ''{0}'' has been downloaded from the server.<br>Because its way points do not include a timestamp we cannot correlate them with images.</html>"
 msgstr ""
 
@@ -9965,5 +9236,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Descrição"
@@ -10001,10 +9272,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:812
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:"
-msgstr ""
-"<html>O envio de dados não processados de GPS como mapa é considerado "
-"arriscado.<br> Se quiser enviar dados, consulte aqui:"
+msgid "<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:"
+msgstr "<html>O envio de dados não processados de GPS como mapa é considerado arriscado.<br> Se quiser enviar dados, consulte aqui:"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:814
@@ -10048,10 +9315,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973
 #, java-format
-msgid ""
-"<html>This action will require {0} individual<br>download requests. Do you "
-"wish<br>to continue?</html>"
-msgstr ""
-"<html> Esta ação irá requerir {0} pedidos <br> individuais para baixar.  "
-"Você deseja </br> continuar? </html>"
+msgid "<html>This action will require {0} individual<br>download requests. Do you wish<br>to continue?</html>"
+msgstr "<html> Esta ação irá requerir {0} pedidos <br> individuais para baixar.  Você deseja </br> continuar? </html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1082
@@ -10060,13 +9323,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1242
-msgid ""
-"Some waypoints with timestamps from before the start of the track or after "
-"the end were omitted or moved to the start."
+msgid "Some waypoints with timestamps from before the start of the track or after the end were omitted or moved to the start."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:1249
-msgid ""
-"Some waypoints which were too far from the track to sensibly estimate their "
-"time were omitted."
+msgid "Some waypoints which were too far from the track to sensibly estimate their time were omitted."
 msgstr ""
 
@@ -10098,11 +9357,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:358
 #, java-format
-msgid ""
-"{0} conflict has been <strong>resolved automatically</strong> by purging {0} "
-"object<br>from the local dataset because it is deleted on the server."
-msgid_plural ""
-"{0} conflicts have been <strong>resolved automatically</strong> by purging "
-"{0} objects<br> from the local dataset because they are deleted on the "
-"server."
+msgid "{0} conflict has been <strong>resolved automatically</strong> by purging {0} object<br>from the local dataset because it is deleted on the server."
+msgid_plural "{0} conflicts have been <strong>resolved automatically</strong> by purging {0} objects<br> from the local dataset because they are deleted on the server."
 msgstr[0] ""
 msgstr[1] ""
@@ -10110,16 +9364,8 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:367
 #, java-format
-msgid ""
-"{0} conflict remains to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve it."
-msgid_plural ""
-"{0} conflicts remain to be resolved.<br><br>Please open the Conflict List "
-"Dialog and manually resolve them."
-msgstr[0] ""
-"{0} conflito ainda não foi resolvido.<br><br>Por favor, abra a janela de "
-"Lista de Conflitos e resolva-o manualmente."
-msgstr[1] ""
-"{0} conflitos ainda não foram resolvidos.<br><br>Por favor, abra a janela de "
-"Lista de Conflitos e resolva-os manualmente."
+msgid "{0} conflict remains to be resolved.<br><br>Please open the Conflict List Dialog and manually resolve it."
+msgid_plural "{0} conflicts remain to be resolved.<br><br>Please open the Conflict List Dialog and manually resolve them."
+msgstr[0] "{0} conflito ainda não foi resolvido.<br><br>Por favor, abra a janela de Lista de Conflitos e resolva-o manualmente."
+msgstr[1] "{0} conflitos ainda não foram resolvidos.<br><br>Por favor, abra a janela de Lista de Conflitos e resolva-os manualmente."
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
@@ -10168,7 +9414,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66
-msgid ""
-"<html>Upload of unprocessed GPS data as map data is considered harmful."
-"<br>If you want to upload traces, look here:</html>"
+msgid "<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>"
 msgstr ""
 
@@ -10231,8 +9475,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:240
-msgid ""
-"<html>Take a photo of your GPS receiver while it displays the time."
-"<br>Display that photo here.<br>And then, simply capture the time you read "
-"on the photo and select a timezone<hr></html>"
+msgid "<html>Take a photo of your GPS receiver while it displays the time.<br>Display that photo here.<br>And then, simply capture the time you read on the photo and select a timezone<hr></html>"
 msgstr ""
 
@@ -10289,6 +9530,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:509
-msgid ""
-"<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
+msgid "<html>Use photo of an accurate clock,<br>e.g. GPS receiver display</html>"
 msgstr ""
 
@@ -10359,6 +9599,5 @@
 #, java-format
 msgid "<html>Matched <b>{0}</b> of <b>{1}</b> photo to GPX track.</html>"
-msgid_plural ""
-"<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
+msgid_plural "<html>Matched <b>{0}</b> of <b>{1}</b> photos to GPX track.</html>"
 msgstr[0] ""
 msgstr[1] ""
@@ -10387,7 +9626,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:947
-msgid ""
-"An error occurred while trying to match the photos to the GPX track. You can "
-"adjust the sliders to manually match the photos."
+msgid "An error occurred while trying to match the photos to the GPX track. You can adjust the sliders to manually match the photos."
 msgstr ""
 
@@ -10409,7 +9646,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:1014
-msgid ""
-"The selected GPX track does not contain timestamps. Please select another "
-"one."
+msgid "The selected GPX track does not contain timestamps. Please select another one."
 msgstr ""
 
@@ -10514,7 +9749,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599
 #, java-format
-msgid ""
-"<html><h3>Delete the file {0} from disk?<p>The image file will be "
-"permanently lost!</h3></html>"
+msgid "<html><h3>Delete the file {0} from disk?<p>The image file will be permanently lost!</h3></html>"
 msgstr ""
 
@@ -10632,9 +9865,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:236
-msgid ""
-"You need to pause audio at the moment when you hear your synchronization cue."
-msgstr ""
-"É necessário pausar o áudio no momento em que você escutar sua marcação de "
-"sincronização"
+msgid "You need to pause audio at the moment when you hear your synchronization cue."
+msgstr "É necessário pausar o áudio no momento em que você escutar sua marcação de sincronização"
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:246
@@ -10654,7 +9884,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java:268
-msgid ""
-"You need to have paused audio at the point on the track where you want the "
-"marker."
+msgid "You need to have paused audio at the point on the track where you want the marker."
 msgstr ""
 
@@ -10672,13 +9900,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:170
-msgid ""
-"You need to drag the play head near to the GPX track whose associated sound "
-"track you were playing (after the first marker)."
+msgid "You need to drag the play head near to the GPX track whose associated sound track you were playing (after the first marker)."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java:225
-msgid ""
-"You need to SHIFT-drag the play head onto an audio marker or onto the track "
-"point where you want to synchronize."
+msgid "You need to SHIFT-drag the play head onto an audio marker or onto the track point where you want to synchronize."
 msgstr ""
 
@@ -10709,13 +9933,11 @@
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:102
 #, java-format
-msgid ""
-"Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
+msgid "Warning: failed to load Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Aviso: falha ao ler estilos Mappaint de ''{0}''. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/mappaint/MapPaintStyles.java:105
 #, java-format
-msgid ""
-"Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
-msgstr ""
+msgid "Warning: failed to parse Mappaint styles from ''{0}''. Exception was: {1}"
+msgstr "Aviso: falha ao analisar estilos Mappaint de ''{0}''. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:37
@@ -10736,7 +9958,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AccessTokenInfoPanel.java:62
-msgid ""
-"<html>Select to save the Access Token in the JOSM preferences.<br>Unselect "
-"to use the Access Token in this JOSM session only.</html>"
+msgid "<html>Select to save the Access Token in the JOSM preferences.<br>Unselect to use the Access Token in this JOSM session only.</html>"
 msgstr ""
 
@@ -10775,7 +9995,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138
-msgid ""
-"<html>JOSM is about to reset the OAuth settings to default values.<br>The "
-"current custom settings are not saved.</html>"
+msgid "<html>JOSM is about to reset the OAuth settings to default values.<br>The current custom settings are not saved.</html>"
 msgstr ""
 
@@ -10797,32 +10015,17 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:73
-msgid ""
-"<html>Run a fully automatic procedure to get an access token from the OSM "
-"website.<br>JOSM accesses the OSM website on behalf of the JOSM user and "
-"fully<br>automatically authorizes the user and retrieves an Access Token.</"
-"html>"
+msgid "<html>Run a fully automatic procedure to get an access token from the OSM website.<br>JOSM accesses the OSM website on behalf of the JOSM user and fully<br>automatically authorizes the user and retrieves an Access Token.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:80
-msgid ""
-"<html>Run a semi-automatic procedure to get an access token from the OSM "
-"website.<br>JOSM submits the standards OAuth requests to get a Request Token "
-"and an<br>Access Token. It dispatches the user to the OSM website in an "
-"external browser<br>to authenticate itself and to accept the request token "
-"submitted by JOSM.</html>"
+msgid "<html>Run a semi-automatic procedure to get an access token from the OSM website.<br>JOSM submits the standards OAuth requests to get a Request Token and an<br>Access Token. It dispatches the user to the OSM website in an external browser<br>to authenticate itself and to accept the request token submitted by JOSM.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:88
-msgid ""
-"<html>Enter an Access Token manually if it was generated and retrieved "
-"outside<br>of JOSM.</html>"
+msgid "<html>Enter an Access Token manually if it was generated and retrieved outside<br>of JOSM.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:97
-msgid ""
-"Please enter your OSM user name and password. The password will <strong>not</"
-"strong> be saved in clear text in the JOSM preferences and it will be "
-"submitted to the OSM server <strong>only once</strong>. Subsequent data "
-"upload requests don't use your password any more."
+msgid "Please enter your OSM user name and password. The password will <strong>not</strong> be saved in clear text in the JOSM preferences and it will be submitted to the OSM server <strong>only once</strong>. Subsequent data upload requests don't use your password any more."
 msgstr ""
 
@@ -10838,9 +10041,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:147
-msgid ""
-"<strong>Warning:</strong> The password is transferred <strong>once</strong> "
-"in clear text to the OSM website. <strong>Do not</strong> use a sensitive "
-"password until the OSM server provides an encrypted communication channel "
-"(HTTPS)."
+msgid "<strong>Warning:</strong> The password is transferred <strong>once</strong> in clear text to the OSM website. <strong>Do not</strong> use a sensitive password until the OSM server provides an encrypted communication channel (HTTPS)."
 msgstr ""
 
@@ -10860,12 +10059,6 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:235
 #, java-format
-msgid ""
-"<html>You have successfully retrieved an OAuth Access Token from the OSM "
-"website. Click on <strong>{0}</strong> to accept the token. JOSM will use it "
-"in subsequent requests to gain access to the OSM API.</html>"
-msgstr ""
-"<html>Você obteve com sucesso um Token de Acesso OAuth do website do OSM. "
-"Clique em <strong>{0}</strong> para aceitar este token. O JOSM irá usá-lo "
-"nas próximas requisições para obter acesso à API do OSM.</html>"
+msgid "<html>You have successfully retrieved an OAuth Access Token from the OSM website. Click on <strong>{0}</strong> to accept the token. JOSM will use it in subsequent requests to gain access to the OSM API.</html>"
+msgstr "<html>Você obteve com sucesso um Token de Acesso OAuth do website do OSM. Clique em <strong>{0}</strong> para aceitar este token. O JOSM irá usá-lo nas próximas requisições para obter acesso à API do OSM.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:329
@@ -10904,7 +10097,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/UserNameValidator.java:26
 msgid "The user name cannot be empty. Please enter your OSM user name"
-msgstr ""
-"O nome de usuário não pode ser vazio. Por favor digite o seu nome de usuário "
-"do OSM"
+msgstr "O nome de usuário não pode ser vazio. Por favor digite o seu nome de usuário do OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:426
@@ -10922,13 +10113,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:452
-msgid ""
-"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed.<br><br>Please try again or choose another kind of "
-"authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
-msgstr ""
-"<html>O processo automático de obtenção de um token de acesso do OAuth<br>a "
-"partir do servidor do OSM falhou.<br><br>Por favor tente novamente ou "
-"escolha outro processo de autorização,<br>i.e. autorização manual ou semi-"
-"automática.</html>"
+msgid "<html>The automatic process for retrieving an OAuth Access Token<br>from the OSM server failed.<br><br>Please try again or choose another kind of authorization process,<br>i.e. semi-automatic or manual authorization.</html>"
+msgstr "<html>O processo automático de obtenção de um token de acesso do OAuth<br>a partir do servidor do OSM falhou.<br><br>Por favor tente novamente ou escolha outro processo de autorização,<br>i.e. autorização manual ou semi-automática.</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:458
@@ -10940,24 +10124,15 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:467
 #, java-format
-msgid ""
-"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed because JOSM was not able to build<br>a valid login URL "
-"from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your "
-"advanced setting and try again.</html>"
+msgid "<html>The automatic process for retrieving an OAuth Access Token<br>from the OSM server failed because JOSM was not able to build<br>a valid login URL from the OAuth Authorize Endpoint URL ''{0}''.<br><br>Please check your advanced setting and try again.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:490
 #, java-format
-msgid ""
-"<html>The automatic process for retrieving an OAuth Access Token<br>from the "
-"OSM server failed. JOSM failed to log into {0}<br>for user {1}."
-"<br><br>Please check username and password and try again.</html>"
+msgid "<html>The automatic process for retrieving an OAuth Access Token<br>from the OSM server failed. JOSM failed to log into {0}<br>for user {1}.<br><br>Please check username and password and try again.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:58
 #, java-format
-msgid ""
-"Please enter an OAuth Access Token which is authorized to access the OSM "
-"server ''{0}''."
+msgid "Please enter an OAuth Access Token which is authorized to access the OSM server ''{0}''."
 msgstr ""
 
@@ -10984,7 +10159,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:139
 #, java-format
-msgid ""
-"<html><body>Please enter an OAuth Access Token which is authorized to access "
-"the OSM server ''{0}''.</body></html>"
+msgid "<html><body>Please enter an OAuth Access Token which is authorized to access the OSM server ''{0}''.</body></html>"
 msgstr ""
 
@@ -10994,8 +10167,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:179
-msgid ""
-"The Access Token Key must not be empty. Please enter an Access Token Key"
-msgstr ""
-"O Token de Acesso não pode ser vazio. Por favor digite o Token de Acesso"
+msgid "The Access Token Key must not be empty. Please enter an Access Token Key"
+msgstr "O Token de Acesso não pode ser vazio. Por favor digite o Token de Acesso"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:197
@@ -11004,7 +10175,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/ManualAuthorizationUI.java:199
-msgid ""
-"The Access Token Secret must not be empty. Please enter an Access Token "
-"Secret"
+msgid "The Access Token Secret must not be empty. Please enter an Access Token Secret"
 msgstr ""
 
@@ -11016,7 +10185,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OAuthAuthorizationWizard.java:115
 #, java-format
-msgid ""
-"With OAuth you grant JOSM the right to upload map data and GPS tracks on "
-"your behalf (<a href=\"{0}\">more info...</a>)."
+msgid "With OAuth you grant JOSM the right to upload map data and GPS tracks on your behalf (<a href=\"{0}\">more info...</a>)."
 msgstr ""
 
@@ -11038,55 +10205,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11099,7 +10266,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:38
 msgid "Select to grant JOSM the right to upload map data on your behalf"
-msgstr ""
-"Selecione para dar ao JSOM o direito de enviar dados do mapa com sua "
-"permissão"
+msgstr "Selecione para dar ao JSOM o direito de enviar dados do mapa com sua permissão"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45
@@ -11109,6 +10274,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46
 msgid "Select to grant JOSM the right to upload GPS traces on your behalf"
-msgstr ""
-"Selecione para dar ao JSOM o direito de enviar trilhas GPS com sua permissão"
+msgstr "Selecione para dar ao JSOM o direito de enviar trilhas GPS com sua permissão"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:53
@@ -11117,10 +10281,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:54
-msgid ""
-"Select to grant JOSM the right to download your private GPS traces into JOSM "
-"layers"
-msgstr ""
-"Selecione para dar ao JSOM o direito de baixar suas trilhas GPS privadas em "
-"camadas do JOSM"
+msgid "Select to grant JOSM the right to download your private GPS traces into JOSM layers"
+msgstr "Selecione para dar ao JSOM o direito de baixar suas trilhas GPS privadas em camadas do JOSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61
@@ -11130,6 +10290,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62
 msgid "Select to grant JOSM the right to read your server preferences"
-msgstr ""
-"Selecione para dar ao JSOM o direito de ler suas configurações do servidor"
+msgstr "Selecione para dar ao JSOM o direito de ler suas configurações do servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69
@@ -11139,7 +10298,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70
 msgid "Select to grant JOSM the right to write your server preferences"
-msgstr ""
-"Selecione para dar ao JSOM o direito de escrever suas preferências do "
-"servidor"
+msgstr "Selecione para dar ao JSOM o direito de escrever suas preferências do servidor"
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java:45
@@ -11178,7 +10335,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:163
 #, java-format
-msgid ""
-"<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request "
-"Token from ''{1}''.</html>"
+msgid "<html>Please click on <strong>{0}</strong> to retrieve an OAuth Request Token from ''{1}''.</html>"
 msgstr ""
 
@@ -11197,12 +10352,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:220
 #, java-format
-msgid ""
-"<html>JOSM successfully retrieved a Request Token. JOSM is now launching an "
-"authorization page in an external browser. Please login with your OSM "
-"username and password and follow the instructions to authorize the Request "
-"Token. Then switch back to this dialog and click on <strong>{0}</"
-"strong><br><br>If launching the external browser fails you can copy the "
-"following authorize URL and paste it into the address field of your browser."
-"</html>"
+msgid "<html>JOSM successfully retrieved a Request Token. JOSM is now launching an authorization page in an external browser. Please login with your OSM username and password and follow the instructions to authorize the Request Token. Then switch back to this dialog and click on <strong>{0}</strong><br><br>If launching the external browser fails you can copy the following authorize URL and paste it into the address field of your browser.</html>"
 msgstr ""
 
@@ -11217,8 +10365,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:306
-msgid ""
-"<html>JOSM has successfully retrieved an Access Token. You can now accept "
-"this token. JOSM will use it in the future for authentication and "
-"authorization to the OSM server.<br><br>The access token is: </html>"
+msgid "<html>JOSM has successfully retrieved an Access Token. You can now accept this token. JOSM will use it in the future for authentication and authorization to the OSM server.<br><br>The access token is: </html>"
 msgstr ""
 
@@ -11255,8 +10400,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:144
 #, java-format
-msgid ""
-"<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server "
-"at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id "
-"''{3}''.</html>"
+msgid "<html>Successfully used the Access Token ''{0}'' to<br>access the OSM server at ''{1}''.<br>You are accessing the OSM server as user ''{2}'' with id ''{3}''.</html>"
 msgstr ""
 
@@ -11267,9 +10409,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:163
 #, java-format
-msgid ""
-"<html>Failed to access the OSM server ''{0}''<br>with the Access Token "
-"''{0}''.<br>The server rejected the Access Token as unauthorized. You will "
-"not<br>be able to access any protected resource on this server using this "
-"token.</html>"
+msgid "<html>Failed to access the OSM server ''{0}''<br>with the Access Token ''{0}''.<br>The server rejected the Access Token as unauthorized. You will not<br>be able to access any protected resource on this server using this token.</html>"
 msgstr ""
 
@@ -11283,10 +10421,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:181
 #, java-format
-msgid ""
-"<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The "
-"test to retrieve the user details for this token failed, though."
-"<br>Depending on what rights are granted to this token you may nevertheless "
-"use it<br>to upload data, upload GPS traces, and/or access other protected "
-"resources.</html>"
+msgid "<html>The Access Token ''{1}'' is known to the OSM server ''{0}''.<br>The test to retrieve the user details for this token failed, though.<br>Depending on what rights are granted to this token you may nevertheless use it<br>to upload data, upload GPS traces, and/or access other protected resources.</html>"
 msgstr ""
 
@@ -11297,23 +10430,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:199
 #, java-format
-msgid ""
-"<html>Failed to retrieve information about the current user from the OSM "
-"server ''{0}''.<br>This is probably not a problem caused by the tested "
-"Access Token, but<br>rather a problem with the server configuration. "
-"Carefully check the server<br>URL and your Internet connection.</html>"
+msgid "<html>Failed to retrieve information about the current user from the OSM server ''{0}''.<br>This is probably not a problem caused by the tested Access Token, but<br>rather a problem with the server configuration. Carefully check the server<br>URL and your Internet connection.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218
 #, java-format
-msgid ""
-"<html>Failed to sign the request for the OSM server ''{0}'' with the token "
-"''{1}''.<br>The token ist probably invalid.</html>"
+msgid "<html>Failed to sign the request for the OSM server ''{0}'' with the token ''{1}''.<br>The token ist probably invalid.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:235
-msgid ""
-"<html>The test failed because the server responded with an internal error."
-"<br>JOSM could not decide whether the token is valid. Please try again later."
-"</html>"
+msgid "<html>The test failed because the server responded with an internal error.<br>JOSM could not decide whether the token is valid. Please try again later.</html>"
 msgstr ""
 
@@ -11347,6 +10471,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:105
 msgid "Default value currently unknown (setting has not been used yet)."
-msgstr ""
-"Valor padrão atual é desconhecido (preferências não foram usadas ainda)"
+msgstr "Valor padrão atual é desconhecido (preferências não foram usadas ainda)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
@@ -11412,26 +10535,17 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:53
 msgid "Show or hide the audio menu entry on the main menu bar."
-msgstr ""
-"Mostrar ou ocultar entrada do menu de áudio na barra do menu principal."
+msgstr "Mostrar ou ocultar entrada do menu de áudio na barra do menu principal."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:58
-msgid ""
-"Display a moving icon representing the point on the synchronized track where "
-"the audio currently playing was recorded."
+msgid "Display a moving icon representing the point on the synchronized track where the audio currently playing was recorded."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:63
-msgid ""
-"Put text labels against audio (and image and web) markers as well as their "
-"button icons."
+msgid "Put text labels against audio (and image and web) markers as well as their button icons."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:68
-msgid ""
-"Automatically make a marker layer from any waypoints when opening a GPX "
-"layer."
-msgstr ""
-"Criar automaticamente camada de marcadores a partir de todos pontos quando "
-"abrir um camada GPX."
+msgid "Automatically make a marker layer from any waypoints when opening a GPX layer."
+msgstr "Criar automaticamente camada de marcadores a partir de todos pontos quando abrir um camada GPX."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:71
@@ -11446,26 +10560,14 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:85
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:95
-msgid ""
-"Automatically create audio markers from trackpoints (rather than explicit "
-"waypoints) with names or descriptions."
-msgstr ""
-"Criar automaticamente marcadores de áudio nos pontos da trilha (e não nos "
-"pontos da via) com nomes e descrições."
+msgid "Automatically create audio markers from trackpoints (rather than explicit waypoints) with names or descriptions."
+msgstr "Criar automaticamente marcadores de áudio nos pontos da trilha (e não nos pontos da via) com nomes e descrições."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:90
-msgid ""
-"Create audio markers at the position on the track corresponding to the "
-"modified time of each audio WAV file imported."
-msgstr ""
-"Crie marcadores de áudio na posição sobre a trilha correspondente à hora de "
-"modificação de cada arquivo de áudio WAV importados."
+msgid "Create audio markers at the position on the track corresponding to the modified time of each audio WAV file imported."
+msgstr "Crie marcadores de áudio na posição sobre a trilha correspondente à hora de modificação de cada arquivo de áudio WAV importados."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:99
-msgid ""
-"The number of seconds to jump forward or back when the relevant button is "
-"pressed"
-msgstr ""
-"O número de segundos para ir para frente ou para trás quando o botão "
-"relevante for pressionado"
+msgid "The number of seconds to jump forward or back when the relevant button is pressed"
+msgstr "O número de segundos para ir para frente ou para trás quando o botão relevante for pressionado"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:100
@@ -11482,10 +10584,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:109
-msgid ""
-"Playback starts this number of seconds before (or after, if negative) the "
-"audio track position requested"
-msgstr ""
-"A reprodução inicia neste número de segundos antes (ou depois, se for "
-"negativo) da faixa de áudio da posição requerida"
+msgid "Playback starts this number of seconds before (or after, if negative) the audio track position requested"
+msgstr "A reprodução inicia neste número de segundos antes (ou depois, se for negativo) da faixa de áudio da posição requerida"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/AudioPreference.java:110
@@ -11579,5 +10677,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Carro"
@@ -11599,16 +10697,25 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378
+#: build/trans_presets.java:488
+#: build/trans_presets.java:745
+#: build/trans_presets.java:764
+#: build/trans_presets.java:778
+#: build/trans_presets.java:800
+#: build/trans_presets.java:837
+#: build/trans_presets.java:850
+#: build/trans_presets.java:862
+#: build/trans_presets.java:874
+#: build/trans_presets.java:886
+#: build/trans_presets.java:898
+#: build/trans_presets.java:908
+#: build/trans_presets.java:917
+#: build/trans_presets.java:926
+#: build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicicleta"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11638,12 +10745,19 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379
+#: build/trans_presets.java:487
+#: build/trans_presets.java:744
+#: build/trans_presets.java:763
+#: build/trans_presets.java:777
+#: build/trans_presets.java:799
+#: build/trans_presets.java:836
+#: build/trans_presets.java:849
+#: build/trans_presets.java:861
+#: build/trans_presets.java:873
+#: build/trans_presets.java:885
+#: build/trans_presets.java:897
+#: build/trans_presets.java:907
+#: build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "A Pé"
@@ -11695,10 +10809,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:105
-msgid ""
-"Maximum length (in meters) to draw lines for local files. Set to ''-1'' to "
-"draw all lines."
-msgstr ""
-"Tamanho máximo (em metros) do desenho de linhas para arquivos locais. Digite "
-"\"-1\" para desenhar todas as linhas."
+msgid "Maximum length (in meters) to draw lines for local files. Set to ''-1'' to draw all lines."
+msgstr "Tamanho máximo (em metros) do desenho de linhas para arquivos locais. Digite \"-1\" para desenhar todas as linhas."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:107
@@ -11707,9 +10817,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:112
-msgid ""
-"Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
-msgstr ""
-"Tamanho máximo (em metros) do desenho de linhas. Digite \"-1\" para desenhar "
-"todas as linhas."
+msgid "Maximum length (in meters) to draw lines. Set to ''-1'' to draw all lines."
+msgstr "Tamanho máximo (em metros) do desenho de linhas. Digite \"-1\" para desenhar todas as linhas."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:114
@@ -11719,9 +10826,6 @@
 #. forceRawGpsLines
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:118
-msgid ""
-"Force drawing of lines if the imported data contain no line information."
-msgstr ""
-"Força o desenho de linhas mesmo que os dados importados não tenham "
-"informações de linha."
+msgid "Force drawing of lines if the imported data contain no line information."
+msgstr "Força o desenho de linhas mesmo que os dados importados não tenham informações de linha."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:130
@@ -11732,15 +10836,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:136
 msgid "Draw the direction arrows using table lookups instead of complex math."
-msgstr ""
-"Desenha as setas de direção  usando tabelas de pesquisa ao invés de cálculos "
-"complexos."
+msgstr "Desenha as setas de direção  usando tabelas de pesquisa ao invés de cálculos complexos."
 
 #. drawGpsArrowsMinDist
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:142
-msgid ""
-"Do not draw arrows if they are not at least this distance away from the last "
-"one."
-msgstr ""
-"Não desenha a seta se ela não estiver a pelo menos esta distância da última."
+msgid "Do not draw arrows if they are not at least this distance away from the last one."
+msgstr "Não desenha a seta se ela não estiver a pelo menos esta distância da última."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:145
@@ -11753,10 +10852,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:182
-msgid ""
-"All points and track segments will have the same color. Can be customized in "
-"Layer Manager."
-msgstr ""
-"Todos os pontos e segmentos de trilhas terão a mesma cor. Isto pode ser "
-"personalizado no Gerenciador de Camadas."
+msgid "All points and track segments will have the same color. Can be customized in Layer Manager."
+msgstr "Todos os pontos e segmentos de trilhas terão a mesma cor. Isto pode ser personalizado no Gerenciador de Camadas."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:183
@@ -11765,7 +10860,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:184
-msgid ""
-"Colors points and track segments by dilution of position (HDOP). Your "
-"capture device needs to log that information."
+msgid "Colors points and track segments by dilution of position (HDOP). Your capture device needs to log that information."
 msgstr ""
 
@@ -11882,6 +10975,5 @@
 #, java-format
 msgid "The following plugin has been downloaded <strong>successfully</strong>:"
-msgid_plural ""
-"The following {0} plugins have been downloaded <strong>successfully</strong>:"
+msgid_plural "The following {0} plugins have been downloaded <strong>successfully</strong>:"
 msgstr[0] "Este plugin foi baixado <strong>com sucesso</strong>:"
 msgstr[1] "Estes {0} plugins foram baixados <strong>com sucesso</strong>:"
@@ -11890,6 +10982,5 @@
 #, java-format
 msgid "Downloading the following plugin has <strong>failed</strong>:"
-msgid_plural ""
-"Downloading the following {0} plugins has <strong>failed</strong>:"
+msgid_plural "Downloading the following {0} plugins has <strong>failed</strong>:"
 msgstr[0] "O download do seguinte plugin <strong>falhou</strong>:"
 msgstr[1] "Os downloads dos {0} plugins seguintes <strong>falharam</strong>:"
@@ -11942,10 +11033,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:331
-msgid ""
-"All installed plugins are up to date. JOSM does not have to download newer "
-"versions."
-msgstr ""
-"Todos os plugins instalados estão atualizados. O JOSM não precisou receber "
-"versões mais novas."
+msgid "All installed plugins are up to date. JOSM does not have to download newer versions."
+msgstr "Todos os plugins instalados estão atualizados. O JOSM não precisou receber versões mais novas."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:332
@@ -11996,31 +11083,13 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:165
-msgid ""
-"<p>Please note that shortcut keys are assigned to the actions when JOSM is "
-"started. So you need to <b>restart</b> JOSM to see your changes.</p>"
+msgid "<p>Please note that shortcut keys are assigned to the actions when JOSM is started. So you need to <b>restart</b> JOSM to see your changes.</p>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167
-msgid ""
-"<p>Furthermore, the shortcuts are activated when the actions are assigned to "
-"a menu entry of a button for the first time. So some of your changes may "
-"become active even without restart --- but also without collision handling. "
-"This is another reason to <b>restart</b> JOSM after making any changes here."
-"</p>"
+msgid "<p>Furthermore, the shortcuts are activated when the actions are assigned to a menu entry of a button for the first time. So some of your changes may become active even without restart --- but also without collision handling. This is another reason to <b>restart</b> JOSM after making any changes here.</p>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170
-msgid ""
-"<p>You may notice that the key selection list on the next page lists all "
-"keys that exist on all kinds of keyboards Java knows about, not just those "
-"keys that exist on your keyboard. Please only use values that correspond to "
-"a real key on your keyboard. If your keyboard has no ''Copy'' key (PC "
-"keyboard do not have them, Sun keyboards do), then do not use it. Also there "
-"are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. "
-"'':''/Colon). Please do not use them either, use the base key ('';''/"
-"Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. "
-"Not doing so may result in conflicts, as there is no way for JOSM to know "
-"that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</"
-"p>"
+msgid "<p>You may notice that the key selection list on the next page lists all keys that exist on all kinds of keyboards Java knows about, not just those keys that exist on your keyboard. Please only use values that correspond to a real key on your keyboard. If your keyboard has no ''Copy'' key (PC keyboard do not have them, Sun keyboards do), then do not use it. Also there are ''keys'' listed that correspond to a shortcut on your keyboard (e.g. '':''/Colon). Please do not use them either, use the base key ('';''/Semicolon on US keyboards, ''.''/Period on German keyboards, etc.) instead. Not doing so may result in conflicts, as there is no way for JOSM to know that Ctrl+Shift+; and Ctrl+: actually is the same thing on an US keyboard.</p>"
 msgstr ""
 
@@ -12030,16 +11099,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:178
-msgid ""
-"<p>The last page lists the modifier keys JOSM will automatically assign to "
-"shortcuts. For every of the four kinds of shortcuts there are three "
-"alternatives. JOSM will try those alternatives in the listed order when "
-"managing a conflict. If all alternatives result in shortcuts that are "
-"already taken, it will assign a random shortcut instead.</p>"
+msgid "<p>The last page lists the modifier keys JOSM will automatically assign to shortcuts. For every of the four kinds of shortcuts there are three alternatives. JOSM will try those alternatives in the listed order when managing a conflict. If all alternatives result in shortcuts that are already taken, it will assign a random shortcut instead.</p>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182
-msgid ""
-"<p>The pseudo-modifier ''disabled'' will disable the shortcut when "
-"encountered.</p>"
+msgid "<p>The pseudo-modifier ''disabled'' will disable the shortcut when encountered.</p>"
 msgstr ""
 
@@ -12124,10 +11186,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:49
-msgid ""
-"Various settings that influence the visual representation of the whole "
-"program."
-msgstr ""
-"Várias configurações que influenciam a apresentação visual de todo o "
-"programa."
+msgid "Various settings that influence the visual representation of the whole program."
+msgstr "Várias configurações que influenciam a apresentação visual de todo o programa."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceTabbedPane.java:50
@@ -12313,7 +11371,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:726
 #, java-format
-msgid ""
-"<html>Failed to load the list of style sources from<br>''{0}''."
-"<br><br>Details (untranslated):<br>{1}</html>"
+msgid "<html>Failed to load the list of style sources from<br>''{0}''.<br><br>Details (untranslated):<br>{1}</html>"
 msgstr ""
 
@@ -12350,12 +11406,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Parâmetros avançados do OAuth"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Nome do rua"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
@@ -12376,7 +11430,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginListPanel.java:80
-msgid ""
-"Please click on <strong>Download list</strong> to download and display a "
-"list of available plugins."
+msgid "Please click on <strong>Download list</strong> to download and display a list of available plugins."
 msgstr ""
 
@@ -12402,10 +11454,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:84
-msgid ""
-"Please decide whether JOSM shall automatically update active plugins at "
-"startup after an update of JOSM itself."
-msgstr ""
-"Por favor, decida se o JOSM deve atualizar automaticamente os plugins ativos "
-"no início do programa depois de uma atualização do próprio JOSM."
+msgid "Please decide whether JOSM shall automatically update active plugins at startup after an update of JOSM itself."
+msgstr "Por favor, decida se o JOSM deve atualizar automaticamente os plugins ativos no início do programa depois de uma atualização do próprio JOSM."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96
@@ -12414,10 +11462,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:128
-msgid ""
-"Please decide whether JOSM shall automatically update active plugins after a "
-"certain periode of time."
-msgstr ""
-"Por favor, decida se o JOSM deve atualizar automaticamente os plugins ativos "
-"depois de um certo período de tempo."
+msgid "Please decide whether JOSM shall automatically update active plugins after a certain periode of time."
+msgstr "Por favor, decida se o JOSM deve atualizar automaticamente os plugins ativos depois de um certo período de tempo."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51
@@ -12428,7 +11472,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:60
 #, java-format
-msgid ""
-"<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and "
-"validate again.</html>"
+msgid "<html>''{0}'' is not a valid OSM API URL.<br>Please check the spelling and validate again.</html>"
 msgstr ""
 
@@ -12440,14 +11482,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:75
 #, java-format
-msgid ""
-"<html>Failed to build URL ''{0}'' for validating the OSM API server."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgid "<html>Failed to build URL ''{0}'' for validating the OSM API server.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:91
 #, java-format
-msgid ""
-"<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of "
-"''{1}'' and your Internet connection and validate again.</html>"
+msgid "<html>Failed to connect to the URL ''{0}''.<br>Please check the spelling of ''{1}'' and your Internet connection and validate again.</html>"
 msgstr ""
 
@@ -12460,16 +11498,10 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:107
 #, java-format
-msgid ""
-"<html>Failed to retrieve a list of changesets from the OSM API server "
-"at<br>''{1}''. The server responded with the return code {0} instead of 200."
-"<br>Please check the spelling of ''{1}'' and validate again.</html>"
+msgid "<html>Failed to retrieve a list of changesets from the OSM API server at<br>''{1}''. The server responded with the return code {0} instead of 200.<br>Please check the spelling of ''{1}'' and validate again.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:124
 #, java-format
-msgid ""
-"<html>The OSM API server at ''{0}'' did not return a valid response.<br>It "
-"is likely that ''{0}'' is not an OSM API server.<br>Please check the "
-"spelling of ''{0}'' and validate again.</html>"
+msgid "<html>The OSM API server at ''{0}'' did not return a valid response.<br>It is likely that ''{0}'' is not an OSM API server.<br>Please check the spelling of ''{0}'' and validate again.</html>"
 msgstr ""
 
@@ -12479,9 +11511,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60
-msgid ""
-"Select to use HTTP basic authentication with your OSM username and password"
-msgstr ""
-"Selecione para usar autenticação básica por HTTP, com o seu nome de usuário "
-"e senha do OSM"
+msgid "Select to use HTTP basic authentication with your OSM username and password"
+msgstr "Selecione para usar autenticação básica por HTTP, com o seu nome de usuário e senha do OSM"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:67
@@ -12495,7 +11524,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106
 #, java-format
-msgid ""
-"Warning: Unsupported value in preference ''{0}'', got {1}''. Using "
-"authentication method ''Basic Authentication''."
+msgid "Warning: Unsupported value in preference ''{0}'', got {1}''. Using authentication method ''Basic Authentication''."
 msgstr ""
 
@@ -12517,9 +11544,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java:88
-msgid ""
-"<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password "
-"is stored in plain text in the JOSM preferences file. Furthermore, it is "
-"transferred <strong>unencrypted</strong> in every request sent to the OSM "
-"server. <strong>Do not use a valuable password.</strong></p></body></html>"
+msgid "<html><body><p class=\"warning-body\"><strong>Warning:</strong> The password is stored in plain text in the JOSM preferences file. Furthermore, it is transferred <strong>unencrypted</strong> in every request sent to the OSM server. <strong>Do not use a valuable password.</strong></p></body></html>"
 msgstr ""
 
@@ -12549,13 +11572,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:187
-msgid ""
-"You do not have an Access Token yet to access the OSM server using OAuth. "
-"Please authorize first."
+msgid "You do not have an Access Token yet to access the OSM server using OAuth. Please authorize first."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:226
 msgid "You already have an Access Token to access the OSM server using OAuth."
-msgstr ""
-"Você já tem um token de acesso para acessar o servidor do OSM usando OAuth."
+msgstr "Você já tem um token de acesso para acessar o servidor do OSM usando OAuth."
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:258
@@ -12572,7 +11592,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OAuthAuthenticationPreferencesPanel.java:332
-msgid ""
-"Click to step through the OAuth authorization process and generate a new "
-"Access Token"
+msgid "Click to step through the OAuth authorization process and generate a new Access Token"
 msgstr ""
 
@@ -12584,6 +11602,5 @@
 #, java-format
 msgid "<html>Use the default OSM server URL (<strong>{0}</strong>)</html>"
-msgstr ""
-"<html>Use a URL do servidor padrão do OSM (<strong>{0}</strong>)</html>"
+msgstr "<html>Use a URL do servidor padrão do OSM (<strong>{0}</strong>)</html>"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/OsmApiUrlInputPanel.java:88
@@ -12631,9 +11648,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:126
-msgid ""
-"Please enter a username and a password if your proxy requires authentication."
-msgstr ""
-"Por gentileza digite seu nome de usuário e senha se o seu proxy requer "
-"autenticação"
+msgid "Please enter a username and a password if your proxy requires authentication."
+msgstr "Por gentileza digite seu nome de usuário e senha se o seu proxy requer autenticação"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:144
@@ -12650,10 +11664,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:244
-msgid ""
-"Use standard system settings (disabled. Start JOSM with <tt>-Djava.net."
-"useSystemProxies=true</tt> to enable)"
-msgstr ""
-"Usar as configurações-padrão do sistema (desabilitado. Inicie o JOSM com "
-"<tt>-Djava.net.useSystemProxies=true</tt> para habilitar)"
+msgid "Use standard system settings (disabled. Start JOSM with <tt>-Djava.net.useSystemProxies=true</tt> to enable)"
+msgstr "Usar as configurações-padrão do sistema (desabilitado. Inicie o JOSM com <tt>-Djava.net.useSystemProxies=true</tt> para habilitar)"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:256
@@ -12666,11 +11676,6 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java:316
-msgid ""
-"Warning: JOSM is configured to use proxies from the system setting, but the "
-"JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
-msgstr ""
-"Aviso> O JOSM é configurado para usar proxies das configurações do sistema, "
-"mas a JVM não está configurada para coletar estas configurações. Reiniciando "
-"as preferências para \"Sem Proxy\""
+msgid "Warning: JOSM is configured to use proxies from the system setting, but the JVM is not configured to retrieve them. Resetting preferences to ''No proxy''"
+msgstr "Aviso> O JOSM é configurado para usar proxies das configurações do sistema, mas a JVM não está configurada para coletar estas configurações. Reiniciando as preferências para \"Sem Proxy\""
 
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java:58
@@ -12696,7 +11701,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:339
 #, java-format
-msgid ""
-"Broken tagging preset \"{0}-{1}\" - number of items in display_values must "
-"be the same as in values"
+msgid "Broken tagging preset \"{0}-{1}\" - number of items in display_values must be the same as in values"
 msgstr ""
 
@@ -12790,14 +11793,9 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/BoundingBoxSelectionPanel.java:87
-msgid ""
-"URL from www.openstreetmap.org (you can paste a download URL here to specify "
-"a bounding box)"
-msgstr ""
-"URL do openstreetmap.org (você pode colar a URL aqui para especificar um "
-"bounding box)"
+msgid "URL from www.openstreetmap.org (you can paste a download URL here to specify a bounding box)"
+msgstr "URL do openstreetmap.org (você pode colar a URL aqui para especificar um bounding box)"
 
 #: ../core/src/org/openstreetmap/josm/gui/widgets/OsmIdTextField.java:46
-msgid ""
-"The current value is not a valid OSM ID. Please enter an integer value > 0"
+msgid "The current value is not a valid OSM ID. Please enter an integer value > 0"
 msgstr ""
 
@@ -12822,7 +11820,5 @@
 #: ../core/src/org/openstreetmap/josm/io/Capabilities.java:93
 #, java-format
-msgid ""
-"Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server "
-"capabilities. Got ''{2}''"
+msgid "Warning: illegal value of attribute ''{0}'' of element ''{1}'' in server capabilities. Got ''{2}''"
 msgstr ""
 
@@ -12835,7 +11831,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ChangesetClosedException.java:87
 #, java-format
-msgid ""
-"Unexpected format of error header for conflict in changeset update. Got "
-"''{0}''"
+msgid "Unexpected format of error header for conflict in changeset update. Got ''{0}''"
 msgstr ""
 
@@ -12868,7 +11862,5 @@
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:362
 #: ../core/src/org/openstreetmap/josm/io/ChangesetQuery.java:366
-msgid ""
-"Cannot create a changeset query including both the query parameters ''uid'' "
-"and ''display_name''"
+msgid "Cannot create a changeset query including both the query parameters ''uid'' and ''display_name''"
 msgstr ""
 
@@ -12880,6 +11872,5 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:85
 #, java-format
-msgid ""
-"Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
+msgid "Unexpected format for port number in in preference ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -12904,21 +11895,15 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:110
 #, java-format
-msgid ""
-"Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will "
-"use no proxy."
+msgid "Warning: unexpected value for preference ''{0}'' found. Got ''{1}''. Will use no proxy."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:121
 #, java-format
-msgid ""
-"Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port "
-"''{1}''."
+msgid "Warning: Unexpected parameters for HTTP proxy. Got host ''{0}'' and port ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:133
 #, java-format
-msgid ""
-"Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port "
-"''{1}''."
+msgid "Warning: Unexpected parameters for SOCKS proxy. Got host ''{0}'' and port ''{1}''."
 msgstr ""
 
@@ -12928,17 +11913,10 @@
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:144
 #, java-format
-msgid ""
-"Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
-msgstr ""
+msgid "Error: Connection to proxy ''{0}'' for URI ''{1}'' failed. Exception was: {2}"
+msgstr "Erro: A conexão ao proxy ''{0}'' pela URI ''{1}'' falhou. A exceção foi: {2}"
 
 #: ../core/src/org/openstreetmap/josm/io/DefaultProxySelector.java:153
-msgid ""
-"Warning: the JVM is not configured to lookup proxies from the system "
-"settings. The property ''java.net.useSystemProxies'' was missing at startup "
-"time.  Will not use a proxy."
-msgstr ""
-"Aviso: a JVM não está configurada para procurar por proxies nas "
-"configurações do sistema. A propriedade ''java.net.useSystemProxies'' não "
-"foi encontrada na inicialização. Não será possível usar um proxy."
+msgid "Warning: the JVM is not configured to lookup proxies from the system settings. The property ''java.net.useSystemProxies'' was missing at startup time.  Will not use a proxy."
+msgstr "Aviso: a JVM não está configurada para procurar por proxies nas configurações do sistema. A propriedade ''java.net.useSystemProxies'' não foi encontrada na inicialização. Não será possível usar um proxy."
 
 #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83
@@ -12976,10 +11954,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:41
-msgid ""
-"Note: GPL is not compatible with the OSM license. Do not upload GPL licensed "
-"tracks."
-msgstr ""
-"Nota: A licença GPL não é compatível com a OSM. Não carregue vias/trilhas "
-"licenciadas pela GPL."
+msgid "Note: GPL is not compatible with the OSM license. Do not upload GPL licensed tracks."
+msgstr "Nota: A licença GPL não é compatível com a OSM. Não carregue vias/trilhas licenciadas pela GPL."
 
 #: ../core/src/org/openstreetmap/josm/io/GpxExporter.java:44
@@ -13053,7 +12027,5 @@
 #: ../plugins/public_transport/src/public_transport/StopImporterAction.java:214
 #, java-format
-msgid ""
-"Error occured while parsing gpx file {0}. Only part of the file will be "
-"available"
+msgid "Error occured while parsing gpx file {0}. Only part of the file will be available"
 msgstr ""
 
@@ -13104,8 +12076,6 @@
 #: ../core/src/org/openstreetmap/josm/io/MirroredInputStream.java:105
 #, java-format
-msgid ""
-"Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in "
-"zip file ''{0}''. Exception was: {1}"
-msgstr ""
+msgid "Warning: failed to open file with extension ''{2}'' and namepart ''{3}'' in zip file ''{0}''. Exception was: {1}"
+msgstr "Aviso: falha ao abrir arquivo com extensão \"{2}\" e nome \"{3}\" no arquivo zip \"{0}\". A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
@@ -13159,7 +12129,5 @@
 
 #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:423
-msgid ""
-"Server replied with response code 404, retrying with an individual request "
-"for each primitive."
+msgid "Server replied with response code 404, retrying with an individual request for each primitive."
 msgstr ""
 
@@ -13215,7 +12183,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:166
 #, java-format
-msgid ""
-"It supports protocol version 0.6, while the server says it supports {0} to "
-"{1}."
+msgid "It supports protocol version 0.6, while the server says it supports {0} to {1}."
 msgstr ""
 
@@ -13233,6 +12199,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:278
 #, java-format
-msgid ""
-"Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
+msgid "Unexpected format of new version of modified primitive ''{0}''. Got ''{1}''."
 msgstr ""
 
@@ -13365,6 +12330,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
 #, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
+msgid "Illegal value for mandatory attribute ''{0}'' of type long. Got ''{1}''."
 msgstr ""
 
@@ -13374,7 +12338,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
 #, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got "
-"''{1}''."
+msgid "Illegal value for mandatory attribute ''{0}'' of type long (>=0). Got ''{1}''."
 msgstr ""
 
@@ -13382,6 +12344,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:108
 #, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
+msgid "Illegal value for mandatory attribute ''{0}'' of type double. Got ''{1}''."
 msgstr ""
 
@@ -13389,6 +12350,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:135
 #, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
+msgid "Illegal value for mandatory attribute ''{0}'' of type boolean. Got ''{1}''."
 msgstr ""
 
@@ -13401,27 +12361,19 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:198
 #, java-format
-msgid ""
-"Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got "
-"''{1}''."
+msgid "Illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType. Got ''{1}''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:231
 #, java-format
-msgid ""
-"Warning: unsupported start element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+msgid "Warning: unsupported start element ''{0}'' in changeset content at position ({1},{2}). Skipping."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:241
-msgid ""
-"Illegal document structure. Found node, way, or relation outside of "
-"''create'', ''modify'', or ''delete''."
+msgid "Illegal document structure. Found node, way, or relation outside of ''create'', ''modify'', or ''delete''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmChangesetContentParser.java:259
 #, java-format
-msgid ""
-"Warning: unsupported end element ''{0}'' in changeset content at position "
-"({1},{2}). Skipping."
+msgid "Warning: unsupported end element ''{0}'' in changeset content at position ({1},{2}). Skipping."
 msgstr ""
 
@@ -13497,7 +12449,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmExporter.java:99
 #, java-format
-msgid ""
-"<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</"
-"html>"
+msgid "<html>An error occurred while restoring backup file.<br>Error is:<br>{0}</html>"
 msgstr ""
 
@@ -13505,5 +12455,5 @@
 #, java-format
 msgid "Could not back up file. Exception is: {0}"
-msgstr ""
+msgstr "Não foi possível criar cópia de segurança. A exceção foi: {0}"
 
 #: ../core/src/org/openstreetmap/josm/io/OsmGzipExporter.java:17
@@ -13523,7 +12473,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
 #, java-format
-msgid ""
-"Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',"
-"minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
+msgid "Missing manadatory attributes on element ''bounds''. Got minlon=''{0}'',minlat=''{1}'',maxlon=''{3}'',maxlat=''{4}'', origin=''{5}''."
 msgstr ""
 
@@ -13568,6 +12516,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:253
 #, java-format
-msgid ""
-"Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
+msgid "Illegal value for attribute ''type'' on member {0} in relation {1}. Got {2}."
 msgstr ""
 
@@ -13593,7 +12540,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:334
 #, java-format
-msgid ""
-"Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got "
-"{1}."
+msgid "Illegal value for attribute ''version'' on OSM primitive with ID {0}. Got {1}."
 msgstr ""
 
@@ -13604,7 +12549,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:358
 #, java-format
-msgid ""
-"WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, "
-"API version is ''{3}''. Got {1}."
+msgid "WARNING: Normalizing value of attribute ''version'' of element {0} to {2}, API version is ''{3}''. Got {1}."
 msgstr ""
 
@@ -13624,7 +12567,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:397
 #, java-format
-msgid ""
-"Illegal value for attribute ''changeset'' on new object {1}. Got {0}. "
-"Resetting to 0."
+msgid "Illegal value for attribute ''changeset'' on new object {1}. Got {0}. Resetting to 0."
 msgstr ""
 
@@ -13648,6 +12589,5 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:436
 #, java-format
-msgid ""
-"Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
+msgid "Way with external ID ''{0}'' includes missing node with external ID ''{1}''."
 msgstr ""
 
@@ -13659,14 +12599,10 @@
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:456
 #, java-format
-msgid ""
-"Way {0} with {1} nodes has incomplete nodes because at least one node was "
-"missing in the loaded data."
+msgid "Way {0} with {1} nodes has incomplete nodes because at least one node was missing in the loaded data."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:512
 #, java-format
-msgid ""
-"Relation with external id ''{0}'' refers to a missing primitive with "
-"external id ''{1}''."
+msgid "Relation with external id ''{0}'' refers to a missing primitive with external id ''{1}''."
 msgstr ""
 
@@ -13749,9 +12685,6 @@
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:87
-msgid ""
-"Could not connect to the OSM server. Please check your internet connection."
-msgstr ""
-"Não foi possível conectar com o servidor OSM. Por favor, verifique sua "
-"conexão de internet."
+msgid "Could not connect to the OSM server. Please check your internet connection."
+msgstr "Não foi possível conectar com o servidor OSM. Por favor, verifique sua conexão de internet."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java:38
@@ -13845,14 +12778,10 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:118
 #, java-format
-msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link is not known. "
-"Skipping download."
+msgid "Warning: Cannot download plugin ''{0}''. Its download link is not known. Skipping download."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java:139
 #, java-format
-msgid ""
-"Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a "
-"valid URL. Skipping download."
+msgid "Warning: Cannot download plugin ''{0}''. Its download link ''{1}'' is not a valid URL. Skipping download."
 msgstr ""
 
@@ -13875,6 +12804,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:108
 msgid "The following plugin is no longer necessary and has been deactivated:"
-msgid_plural ""
-"The following plugins are no longer necessary and have been deactivated:"
+msgid_plural "The following plugins are no longer necessary and have been deactivated:"
 msgstr[0] ""
 msgstr[1] ""
@@ -13882,17 +12810,10 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:140
 #, java-format
-msgid ""
-"<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no "
-"longer developed and very likely will produce errors.<br>It should be "
-"disabled.<br>Delete from preferences?</html>"
+msgid "<html>Loading of the plugin \"{0}\" was requested.<br>This plugin is no longer developed and very likely will produce errors.<br>It should be disabled.<br>Delete from preferences?</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:167
-msgid ""
-"You updated your JOSM software.<br>To prevent problems the plugins should be "
-"updated as well.<br><br>Update plugins now?"
-msgstr ""
-"Você atualizou o seu JOSM.<br>Para se prevenir de problemas os plugins "
-"também devem ser atualizados.<br><br>Atualizar os plugins agora?"
+msgid "You updated your JOSM software.<br>To prevent problems the plugins should be updated as well.<br><br>Update plugins now?"
+msgstr "Você atualizou o seu JOSM.<br>Para se prevenir de problemas os plugins também devem ser atualizados.<br><br>Atualizar os plugins agora?"
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183
@@ -13914,40 +12835,28 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:215
-msgid ""
-"Skipping plugin update after JOSM upgrade. Automatic update at startup is "
-"disabled."
+msgid "Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:217
-msgid ""
-"Skipping plugin update after elapsed update interval. Automatic update at "
-"startup is disabled."
+msgid "Skipping plugin update after elapsed update interval. Automatic update at startup is disabled."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:224
-msgid ""
-"Running plugin update after JOSM upgrade. Automatic update at startup is "
-"enabled."
+msgid "Running plugin update after JOSM upgrade. Automatic update at startup is enabled."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:226
-msgid ""
-"Running plugin update after elapsed update interval. Automatic update at "
-"startup is disabled."
+msgid "Running plugin update after elapsed update interval. Automatic update at startup is disabled."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:232
 #, java-format
-msgid ""
-"Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
+msgid "Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:270
 #, java-format
-msgid ""
-"Plugin {0} requires a plugin which was not found. The missing plugin is:"
-msgid_plural ""
-"Plugin {0} requires {1} plugins which were not found. The missing plugins "
-"are:"
+msgid "Plugin {0} requires a plugin which was not found. The missing plugin is:"
+msgid_plural "Plugin {0} requires {1} plugins which were not found. The missing plugins are:"
 msgstr[0] ""
 msgstr[1] ""
@@ -13955,7 +12864,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:292
 #, java-format
-msgid ""
-"<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}."
-"<br>You have to update JOSM in order to use this plugin.</html>"
+msgid "<html>Plugin {0} requires JOSM version {1}. The current JOSM version is {2}.<br>You have to update JOSM in order to use this plugin.</html>"
 msgstr ""
 
@@ -13967,7 +12874,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:387
 #, java-format
-msgid ""
-"<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was "
-"not found.<br>Delete from preferences?"
+msgid "<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>Delete from preferences?"
 msgstr ""
 
@@ -14021,10 +12926,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:600
-msgid ""
-"Please open the Preference Dialog after JOSM has started and try to update "
-"it manually."
-msgid_plural ""
-"Please open the Preference Dialog after JOSM has started and try to update "
-"them manually."
+msgid "Please open the Preference Dialog after JOSM has started and try to update it manually."
+msgid_plural "Please open the Preference Dialog after JOSM has started and try to update them manually."
 msgstr[0] ""
 msgstr[1] ""
@@ -14069,14 +12970,10 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:795
 #, java-format
-msgid ""
-"Warning: failed to install already downloaded plugin ''{0}''. Skipping "
-"installation. JOSM is still going to load the old plugin version."
+msgid "Warning: failed to install already downloaded plugin ''{0}''. Skipping installation. JOSM is still going to load the old plugin version."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:794
 #, java-format
-msgid ""
-"Warning: failed to install plugin ''{0}'' from temporary download file "
-"''{1}''. Renaming failed."
+msgid "Warning: failed to install plugin ''{0}'' from temporary download file ''{1}''. Renaming failed."
 msgstr ""
 
@@ -14088,6 +12985,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:819
 #, java-format
-msgid ""
-"An unexpected exception occurred that may have come from the ''{0}'' plugin."
+msgid "An unexpected exception occurred that may have come from the ''{0}'' plugin."
 msgstr "Uma exceção não esperada pode ter ocorrido devido ao plugin ''{0}''."
 
@@ -14098,9 +12994,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:825
-msgid ""
-"Try updating to the newest version of this plugin before reporting a bug."
-msgstr ""
-"Tente atualizar para a versão mais nova deste plugin antes de reportar um "
-"bug."
+msgid "Try updating to the newest version of this plugin before reporting a bug."
+msgstr "Tente atualizar para a versão mais nova deste plugin antes de reportar um bug."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:827
@@ -14109,10 +13002,6 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:899
-msgid ""
-"The plugin has been removed from the configuration. Please restart JOSM to "
-"unload the plugin."
-msgstr ""
-"O plugin foi removido da configuração. Por favor, reinicie o JOSM para "
-"desativar o plugin."
+msgid "The plugin has been removed from the configuration. Please restart JOSM to unload the plugin."
+msgstr "O plugin foi removido da configuração. Por favor, reinicie o JOSM para desativar o plugin."
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:941
@@ -14126,7 +13015,5 @@
 
 #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:978
-msgid ""
-"Do not ask again and remember my decision (go to Preferences->Plugins to "
-"change it later)"
+msgid "Do not ask again and remember my decision (go to Preferences->Plugins to change it later)"
 msgstr ""
 
@@ -14183,7 +13070,5 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:185
 #, java-format
-msgid ""
-"Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list "
-"from plugin site ''{1}''."
+msgid "Warning: failed to create plugin directory ''{0}''. Cannot cache plugin list from plugin site ''{1}''."
 msgstr ""
 
@@ -14201,8 +13086,6 @@
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:238
 #, java-format
-msgid ""
-"Failed to parse plugin list document from site ''{0}''. Skipping site. "
-"Exception was: {1}"
-msgstr ""
+msgid "Failed to parse plugin list document from site ''{0}''. Skipping site. Exception was: {1}"
+msgstr "Falha ao analisar documento com lista de plugins do site ''{0}''. Vou pular este site. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/plugins/ReadRemotePluginInformationTask.java:248
@@ -14230,9 +13113,6 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:70
-msgid ""
-"An unexpected exception occurred.<br>This is always a coding error. If you "
-"are running the latest<br>version of JOSM, please consider being kind and "
-"file a bug report."
-msgstr ""
+msgid "An unexpected exception occurred.<br>This is always a coding error. If you are running the latest<br>version of JOSM, please consider being kind and file a bug report."
+msgstr "Uma exceção inesperada aconteceu.<br>Este problema é sempre por erro no código do programa. Se você estiver rodando a última<br>versão do JOSM, por favor, seja gentil e redija um relatório de erro."
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:75
@@ -14241,26 +13121,17 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:123
-msgid ""
-"You have encountered an error in JOSM. Before you file a bug report make "
-"sure you have updated to the latest version of JOSM here:"
+msgid "You have encountered an error in JOSM. Before you file a bug report make sure you have updated to the latest version of JOSM here:"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:127
-msgid ""
-"You should also update your plugins. If neither of those help please file a "
-"bug report in our bugtracker using this link:"
+msgid "You should also update your plugins. If neither of those help please file a bug report in our bugtracker using this link:"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:131
-msgid ""
-"There the error information provided below should already be filled in for "
-"you. Please include information on how to reproduce the error and try to "
-"supply as much detail as possible."
+msgid "There the error information provided below should already be filled in for you. Please include information on how to reproduce the error and try to supply as much detail as possible."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:135
-msgid ""
-"Alternatively, if that does not work you can manually fill in the "
-"information below at this URL:"
+msgid "Alternatively, if that does not work you can manually fill in the information below at this URL:"
 msgstr ""
 
@@ -14275,69 +13146,41 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:42
 #, java-format
-msgid ""
-"<html>Failed to initialize communication with the OSM server {0}.<br>Check "
-"the server URL in your preferences and your internet connection.</html>"
+msgid "<html>Failed to initialize communication with the OSM server {0}.<br>Check the server URL in your preferences and your internet connection.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:57
 #, java-format
-msgid ""
-"<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using "
-"OAuth to authenticate but currently there is no<br>OAuth Access Token "
-"configured.<br>Please open the Preferences Dialog and generate or enter an "
-"Access Token.</html>"
+msgid "<html>Failed to authenticate at the OSM server ''{0}''.<br>You are using OAuth to authenticate but currently there is no<br>OAuth Access Token configured.<br>Please open the Preferences Dialog and generate or enter an Access Token.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:78
 #, java-format
-msgid ""
-"<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is "
-"still referred to by relation {1}.<br>Please load relation {1}, remove the "
-"reference to relation {0}, and upload again.</html>"
+msgid "<html><strong>Failed</strong> to delete <strong>relation {0}</strong>. It is still referred to by relation {1}.<br>Please load relation {1}, remove the reference to relation {0}, and upload again.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:105
 #, java-format
-msgid ""
-"<html>Uploading to the server <strong>failed</strong> because your "
-"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
-"html>"
-msgstr ""
-"<html>Envio ao servidor <strong>falhou</strong> porque seu conjunto<br> de "
-"dados atual viola uma pré-condição.<br>A mensagem de erro é:<br>{0}</html>"
+msgid "<html>Uploading to the server <strong>failed</strong> because your current<br>dataset violates a precondition.<br>The error message is:<br>{0}</html>"
+msgstr "<html>Envio ao servidor <strong>falhou</strong> porque seu conjunto<br> de dados atual viola uma pré-condição.<br>A mensagem de erro é:<br>{0}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:113
 #, java-format
-msgid ""
-"<html>Authentication at the OSM server with the username ''{0}'' failed."
-"<br>Please check the username and the password in the JOSM preferences.</"
-"html>"
+msgid "<html>Authentication at the OSM server with the username ''{0}'' failed.<br>Please check the username and the password in the JOSM preferences.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:123
 #, java-format
-msgid ""
-"<html>Authentication at the OSM server with the OAuth token ''{0}'' failed."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+msgid "<html>Authentication at the OSM server with the OAuth token ''{0}'' failed.<br>Please launch the preferences dialog and retrieve another OAuth token.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:133
 #, java-format
-msgid ""
-"<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed."
-"<br>The token is not authorised to access the protected resource<br>''{1}''."
-"<br>Please launch the preferences dialog and retrieve another OAuth token.</"
-"html>"
+msgid "<html>Authorisation at the OSM server with the OAuth token ''{0}'' failed.<br>The token is not authorised to access the protected resource<br>''{1}''.<br>Please launch the preferences dialog and retrieve another OAuth token.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:152
 #, java-format
-msgid ""
-"<html>Communication with the OSM server ''{0}'' timed out. Please retry "
-"later.</html>"
-msgstr ""
-"<html>O tempo de comunicação com o servidor OSM ''{0}'' esgotou. Por favor "
-"tente de novo.</html>"
+msgid "<html>Communication with the OSM server ''{0}'' timed out. Please retry later.</html>"
+msgstr "<html>O tempo de comunicação com o servidor OSM ''{0}'' esgotou. Por favor tente de novo.</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:172
@@ -14347,30 +13190,20 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:174
 #, java-format
-msgid ""
-"<html>Communication with the OSM server ''{0}''failed. The server "
-"replied<br>the following error code and the following error message:"
-"<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</"
-"strong>: {2}</html>"
+msgid "<html>Communication with the OSM server ''{0}''failed. The server replied<br>the following error code and the following error message:<br><strong>Error code:<strong> {1}<br><strong>Error message (untranslated)</strong>: {2}</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:212
 #, java-format
-msgid ""
-"<html>Closing of changeset <strong>{0}</strong> failed <br>because it has "
-"already been closed.</html>"
+msgid "<html>Closing of changeset <strong>{0}</strong> failed <br>because it has already been closed.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:218
 #, java-format
-msgid ""
-"<html>Closing of changeset <strong>{0}</strong> failed<br> because it has "
-"already been closed on {1}.</html>"
+msgid "<html>Closing of changeset <strong>{0}</strong> failed<br> because it has already been closed on {1}.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:227
 #, java-format
-msgid ""
-"<html>The server reported that it has detected a conflict.<br>Error message "
-"(untranslated):<br>{0}</html>"
+msgid "<html>The server reported that it has detected a conflict.<br>Error message (untranslated):<br>{0}</html>"
 msgstr ""
 
@@ -14381,45 +13214,30 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:248
 #, java-format
-msgid ""
-"<html>Failed to upload to changeset <strong>{0}</strong><br>because it has "
-"already been closed on {1}.</html>"
+msgid "<html>Failed to upload to changeset <strong>{0}</strong><br>because it has already been closed on {1}.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:288
 #, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''<br>for "
-"security reasons. This is most likely because you are running<br>in an "
-"applet and because you did not load your applet from ''{1}''.</html>"
+msgid "<html>Failed to open a connection to the remote server<br>''{0}''<br>for security reasons. This is most likely because you are running<br>in an applet and because you did not load your applet from ''{1}''.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:304
 #, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please "
-"check your internet connection.</html>"
+msgid "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Please check your internet connection.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:321
 #, java-format
-msgid ""
-"<html>Failed to upload data to or download data from<br>''{0}''<br>due to a "
-"problem with transferring data.<br>Details(untranslated): {1}</html>"
-msgstr ""
-"<html>Falha ao enviar ou baixar dados de <br>''{0}''<br> devido a um "
-"problema com a tranferência de dados.<br>Detalhes(não-traduzidos): {1}</html>"
+msgid "<html>Failed to upload data to or download data from<br>''{0}''<br>due to a problem with transferring data.<br>Details(untranslated): {1}</html>"
+msgstr "<html>Falha ao enviar ou baixar dados de <br>''{0}''<br> devido a um problema com a tranferência de dados.<br>Detalhes(não-traduzidos): {1}</html>"
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:336
 #, java-format
-msgid ""
-"<html>Failed to download data. Its format is either unsupported, ill-formed, "
-"and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
+msgid "<html>Failed to download data. Its format is either unsupported, ill-formed, and/or inconsistent.<br><br>Details (untranslated): {0}</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:352
 #, java-format
-msgid ""
-"<html>The OSM server<br>''{0}''<br>reported an internal server error."
-"<br>This is most likely a temporary problem. Please try again later.</html>"
+msgid "<html>The OSM server<br>''{0}''<br>reported an internal server error.<br>This is most likely a temporary problem. Please try again later.</html>"
 msgstr ""
 
@@ -14430,8 +13248,5 @@
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:371
-msgid ""
-"The area you tried to download is too big or your request was too large."
-"<br>Either request a smaller area or use an export file provided by the OSM "
-"community."
+msgid "The area you tried to download is too big or your request was too large.<br>Either request a smaller area or use an export file provided by the OSM community."
 msgstr ""
 
@@ -14443,26 +13258,15 @@
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:388
 #, java-format
-msgid ""
-"The OSM server ''{0}'' does not know about an object<br>you tried to read, "
-"update, or delete. Either the respective object<br>does not exist on the "
-"server or you are using an invalid URL to access<br>it. Please carefully "
-"check the server''s address ''{0}'' for typos."
+msgid "The OSM server ''{0}'' does not know about an object<br>you tried to read, update, or delete. Either the respective object<br>does not exist on the server or you are using an invalid URL to access<br>it. Please carefully check the server''s address ''{0}'' for typos."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:415
 #, java-format
-msgid ""
-"<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host "
-"name ''{1}'' could not be resolved. <br>Please check the API URL in your "
-"preferences and your internet connection.</html>"
+msgid "<html>Failed to open a connection to the remote server<br>''{0}''.<br>Host name ''{1}'' could not be resolved. <br>Please check the API URL in your preferences and your internet connection.</html>"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ExceptionUtil.java:487
 #, java-format
-msgid ""
-"<html>The server reports that an object is deleted.<br><strong>Uploading "
-"failed</strong> if you tried to update or delete this object.<br> "
-"<strong>Downloading failed</strong> if you tried to download this object."
-"<br><br>The error message is:<br>{0}</html>"
+msgid "<html>The server reports that an object is deleted.<br><strong>Uploading failed</strong> if you tried to update or delete this object.<br> <strong>Downloading failed</strong> if you tried to download this object.<br><br>The error message is:<br>{0}</html>"
 msgstr ""
 
@@ -14470,39 +13274,29 @@
 #, java-format
 msgid "Unable to find translation for the locale {0}. Reverting to {1}."
-msgstr ""
-"Não foi possível encontrar tradução para localização {0}. Revertendo para "
-"{1}."
+msgstr "Não foi possível encontrar tradução para localização {0}. Revertendo para {1}."
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:151
 #, java-format
 msgid "Warning: failed to handle zip file ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Aviso: falha ao manipular arquivo zip ''{0}''. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:203
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:217
 #, java-format
-msgid ""
-"Warning: failed to access directory ''{0}'' for security reasons. Exception "
-"was: {1}"
+msgid "Warning: failed to access directory ''{0}'' for security reasons. Exception was: {1}"
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/ImageProvider.java:237
 #, java-format
-msgid ""
-"Fatal: failed to locate image ''{0}''. This is a serious configuration "
-"problem. JOSM will stop working."
+msgid "Fatal: failed to locate image ''{0}''. This is a serious configuration problem. JOSM will stop working."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/LanguageInfo.java:24
 #, java-format
-msgid ""
-"Warning: failed to derive wiki language prefix from JOSM locale code "
-"''{0}''. Using default code ''en''."
+msgid "Warning: failed to derive wiki language prefix from JOSM locale code ''{0}''. Using default code ''en''."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/OpenBrowser.java:40
-msgid ""
-"Failed to open URL. There is currently no platform set. Please set a "
-"platform first."
+msgid "Failed to open URL. There is currently no platform set. Please set a platform first."
 msgstr ""
 
@@ -14557,40 +13351,30 @@
 #, java-format
 msgid "Warning: failed to read MOTD from ''{0}''. Exception was: {1}"
-msgstr ""
+msgstr "Aviso: falha ao ler a Mensagem do Dia (MOTD) do ''{0}''. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:60
 #: ../core/src/org/openstreetmap/josm/tools/WikiReader.java:80
 #, java-format
-msgid ""
-"Warning: failed to read MOTD from ''{0}'' for security reasons. Exception "
-"was: {1}"
-msgstr ""
+msgid "Warning: failed to read MOTD from ''{0}'' for security reasons. Exception was: {1}"
+msgstr "Aviso: falha ao ler a Mensagem do Dia (MOTD) do ''{0}'' por razões de segurança. A exceção foi: {1}"
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:107
 #, java-format
-msgid ""
-"Preference with key ''{0}'' does not include ''{1}''. Cannot restore window "
-"geometry from preferences."
+msgid "Preference with key ''{0}'' does not include ''{1}''. Cannot restore window geometry from preferences."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:113
 #, java-format
-msgid ""
-"Preference with key ''{0}'' does not provide an int value for ''{1}''. Got "
-"{2}. Cannot restore window geometry from preferences."
+msgid "Preference with key ''{0}'' does not provide an int value for ''{1}''. Got {2}. Cannot restore window geometry from preferences."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:115
 #, java-format
-msgid ""
-"Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: "
-"{2}. Cannot restore window geometry from preferences."
-msgstr ""
+msgid "Failed to parse field ''{1}'' in preference with key ''{0}''. Exception was: {2}. Cannot restore window geometry from preferences."
+msgstr "Falha ao analisar o campo ''{1}'' das preferências, com chave ''{0}''. A exceção foi: {2}. Não foi possível restaurar a geometria das janela a partir das preferências."
 
 #: ../core/src/org/openstreetmap/josm/tools/WindowGeometry.java:122
 #, java-format
-msgid ""
-"Preference with key ''{0}'' does not exist. Cannot restore window geometry "
-"from preferences."
+msgid "Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences."
 msgstr ""
 
@@ -14600,7 +13384,5 @@
 
 #: ../plugins/Create_grid_of_ways/src/CreateGridOfWaysPlugin/CreateGridOfWaysAction.java:34
-msgid ""
-"Forms a grid of ways in base to two existing that have various nodes and one "
-"in common"
+msgid "Forms a grid of ways in base to two existing that have various nodes and one in common"
 msgstr ""
 
@@ -14627,15 +13409,9 @@
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:61
 msgid "Trackable (only shared as anonymous, ordered points with timestamps)"
-msgstr ""
-"Rastreável (apenas compartilhado como anônimo, mas com pontos ordenados e "
-"com informações de tempo)"
+msgstr "Rastreável (apenas compartilhado como anônimo, mas com pontos ordenados e com informações de tempo)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:62
-msgid ""
-"Identifiable (shown in trace list and as identifiable, ordered points with "
-"timestamps)"
-msgstr ""
-"Identificável (exibido na lista de trilhas e identificável, com pontos "
-"ordenados e com informações de tempo)"
+msgid "Identifiable (shown in trace list and as identifiable, ordered points with timestamps)"
+msgstr "Identificável (exibido na lista de trilhas e identificável, com pontos ordenados e com informações de tempo)"
 
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:106
@@ -14649,6 +13425,7 @@
 msgstr "Enviar Trilhas"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Visibilidade"
@@ -14739,5 +13516,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolação de Endereços"
@@ -14924,5 +13701,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Criar um prédio"
@@ -14963,19 +13740,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Construções"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14983,5 +13760,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14994,10 +13771,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15098,7 +13875,6 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:364
 #, java-format
-msgid ""
-"Warning: failed to put option pane dialog always on top. Exception was: {0}"
-msgstr ""
+msgid "Warning: failed to put option pane dialog always on top. Exception was: {0}"
+msgstr "Aviso: falha ao colocar o diálogo das opções do painel acima das outras. A exceção foi: {0}"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:31
@@ -15124,6 +13900,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:59
-msgid ""
-"Automaticly select first WMS layer when grabing if multiple layers exist."
+msgid "Automaticly select first WMS layer when grabing if multiple layers exist."
 msgstr ""
 
@@ -15180,7 +13955,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
-#: build/trans_style.java:1010 build/trans_style.java:1026
-#: build/trans_style.java:1033 build/trans_style.java:3492
+#: build/trans_presets.java:2348
+#: build/trans_style.java:993
+#: build/trans_style.java:1010
+#: build/trans_style.java:1026
+#: build/trans_style.java:1033
+#: build/trans_style.java:3492
 #: build/trans_style.java:3500
 msgid "water"
@@ -15301,6 +14079,8 @@
 #. <condition k="addr:interpolation" v="alphabetic"/>
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:72
-#: build/trans_style.java:4320 build/trans_style.java:4327
-#: build/trans_style.java:4334 build/trans_style.java:4341
+#: build/trans_style.java:4320
+#: build/trans_style.java:4327
+#: build/trans_style.java:4334
+#: build/trans_style.java:4341
 msgid "address"
 msgstr "endereço"
@@ -15327,11 +14107,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:93
-msgid ""
-"A special handler of the French cadastre wms at www.cadastre.gouv."
-"fr<BR><BR>Please read the Terms and Conditions of Use here (in French): "
-"<br><a href=\"http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/"
-"CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created "
-"by this plugin."
+msgid "A special handler of the French cadastre wms at www.cadastre.gouv.fr<BR><BR>Please read the Terms and Conditions of Use here (in French): <br><a href=\"http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html\"> http://www.cadastre.gouv.fr/scpc/html/CU_01_ConditionsGenerales_fr.html</a> <BR>before any upload of data created by this plugin."
 msgstr ""
 
@@ -15350,13 +14124,9 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:112
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:317
-msgid ""
-"Replace the original white background by the backgound color defined in JOSM "
-"preferences."
+msgid "Replace the original white background by the backgound color defined in JOSM preferences."
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:117
-msgid ""
-"Invert the original black and white colors (and all intermediate greys). "
-"Useful for texts on dark backgrounds."
+msgid "Invert the original black and white colors (and all intermediate greys). Useful for texts on dark backgrounds."
 msgstr ""
 
@@ -15367,7 +14137,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:132
 msgid "Set WMS layers transparency. Right is opaque, left is transparent."
-msgstr ""
-"Configurar transparência da camada WMS. Para direita é mais opaco, para a "
-"esquerda é mais transparente."
+msgstr "Configurar transparência da camada WMS. Para direita é mais opaco, para a esquerda é mais transparente."
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:143
@@ -15486,7 +14254,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:329
-msgid ""
-"Automatically selects the first WMS layer if multiple layers exist when "
-"grabbing."
+msgid "Automatically selects the first WMS layer if multiple layers exist when grabbing."
 msgstr ""
 
@@ -15666,12 +14432,10 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:57
 #, java-format
-msgid ""
-"Cannot load cache {0} which is not compatible with current projection zone"
+msgid "Cannot load cache {0} which is not compatible with current projection zone"
 msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:63
 #, java-format
-msgid ""
-"Selected file {0} is not a cache file from this plugin (invalid extension)"
+msgid "Selected file {0} is not a cache file from this plugin (invalid extension)"
 msgstr ""
 
@@ -15698,7 +14462,5 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionNewLocation.java:46
-msgid ""
-"<html>Enter the town,village or city name.<br>Use the syntax and punctuation "
-"known by www.cadastre.gouv.fr .</html>"
+msgid "<html>Enter the town,village or city name.<br>Use the syntax and punctuation known by www.cadastre.gouv.fr .</html>"
 msgstr ""
 
@@ -15837,6 +14599,5 @@
 #: ../plugins/czechaddress/src/org/openstreetmap/josm/plugins/czechaddress/actions/SplitAreaByEmptyWayAction.java:78
 msgid ""
-"The selected area cannot be splitted, because it is a member of some "
-"relation.\n"
+"The selected area cannot be splitted, because it is a member of some relation.\n"
 "Remove the area from the relation before splitting it."
 msgstr ""
@@ -16038,8 +14799,5 @@
 
 #: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:97
-msgid ""
-"Cannot load library rxtxSerial. If you need support to install it try "
-"Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-"
-"plugin/"
+msgid "Cannot load library rxtxSerial. If you need support to install it try Globalsat homepage at http://www.raphael-mack.de/josm-globalsat-gpx-import-plugin/"
 msgstr ""
 
@@ -16311,24 +15069,17 @@
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:72
-msgid ""
-"Maximum number of nodes to generate before bailing out (before simplifying "
-"lines). Default 50000."
+msgid "Maximum number of nodes to generate before bailing out (before simplifying lines). Default 50000."
 msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:73
-msgid ""
-"Maximum gray value to accept as water (based on Landsat IR-1 data). Can be "
-"in the range 0-255. Default 90."
+msgid "Maximum gray value to accept as water (based on Landsat IR-1 data). Can be in the range 0-255. Default 90."
 msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:74
-msgid ""
-"Accuracy of Douglas-Peucker line simplification, measured in degrees."
-"<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
+msgid "Accuracy of Douglas-Peucker line simplification, measured in degrees.<br>Lower values give more nodes, and more accurate lines. Default 0.0003."
 msgstr ""
 
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:75
-msgid ""
-"Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
+msgid "Resolution of Landsat tiles, measured in pixels per degree. Default 4000."
 msgstr ""
 
@@ -16602,8 +15353,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:106
-msgid ""
-"<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A "
-"new server is available at schokokeks.org.<br>Do you want to switch to the "
-"new server? (Strongly recommended)</html>"
+msgid "<html>The openstreetbugs plugin is using the old server at appspot.com.<br>A new server is available at schokokeks.org.<br>Do you want to switch to the new server? (Strongly recommended)</html>"
 msgstr ""
 
@@ -16613,7 +15361,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
-msgid ""
-"<html>The selected data contains data from OpenStreetBugs.<br>You cannot "
-"upload this data. Maybe you have selected the wrong layer?"
+msgid "<html>The selected data contains data from OpenStreetBugs.<br>You cannot upload this data. Maybe you have selected the wrong layer?"
 msgstr ""
 
@@ -16650,7 +15396,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:142
-msgid ""
-"The visible area is either too small or too big to download data from "
-"OpenStreetBugs"
+msgid "The visible area is either too small or too big to download data from OpenStreetBugs"
 msgstr ""
 
@@ -16694,7 +15438,5 @@
 
 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/action/CloseIssueAction.java:73
-msgid ""
-"<html>Really mark this issue as ''done''?<br><br>You may add an optional "
-"comment:</html>"
+msgid "<html>Really mark this issue as ''done''?<br><br>You may add an optional comment:</html>"
 msgstr ""
 
@@ -16768,7 +15510,5 @@
 
 #: ../plugins/osmarender/src/org/openstreetmap/josm/plugins/osmarender/OsmarenderPlugin.java:100
-msgid ""
-"Firefox not found. Please set firefox executable in the Map Settings page of "
-"the preferences."
+msgid "Firefox not found. Please set firefox executable in the Map Settings page of the preferences."
 msgstr ""
 
@@ -17000,5 +15740,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Transporte Público"
@@ -17041,5 +15781,5 @@
 #, java-format
 msgid "IOException \"{0}\" occurred"
-msgstr ""
+msgstr "Ocorreu a IOException \"{0}\""
 
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:83
@@ -17050,5 +15790,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Pontos da via"
@@ -17076,7 +15816,5 @@
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:35
 msgid "A plugin that allows JOSM to be controlled from other applications."
-msgstr ""
-"Um plugin que permite que o JOSM seja controlado a partir de outros "
-"programas."
+msgstr "Um plugin que permite que o JOSM seja controlado a partir de outros programas."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:36
@@ -17089,12 +15827,6 @@
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:37
-msgid ""
-"The Remote Control plugin will always listen on port 8111 on localhost.The "
-"port is not variable because it is referenced by external applications "
-"talking to the plugin."
-msgstr ""
-"O plugin de Controle Remoto vai sermpre ouvir na porta 8111 em localhost. A "
-"porta não está disponível porque ela está sendo referenciada por uma "
-"aplicação externa."
+msgid "The Remote Control plugin will always listen on port 8111 on localhost.The port is not variable because it is referenced by external applications talking to the plugin."
+msgstr "O plugin de Controle Remoto vai sermpre ouvir na porta 8111 em localhost. A porta não está disponível porque ela está sendo referenciada por uma aplicação externa."
 
 #: ../plugins/remotecontrol/src/org/openstreetmap/josm/plugins/remotecontrol/RemoteControlPreferences.java:42
@@ -17445,6 +16177,5 @@
 
 #: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:23
-msgid ""
-"Open the tagging preset test tool for previewing tagging preset dialogs."
+msgid "Open the tagging preset test tool for previewing tagging preset dialogs."
 msgstr ""
 
@@ -17516,7 +16247,5 @@
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:122
 msgid "Lowest housenumber cannot be higher than highest housenumber"
-msgstr ""
-"O número mais baixo de endereço não pode ser maior que o número mais alto de "
-"endereço."
+msgstr "O número mais baixo de endereço não pode ser maior que o número mais alto de endereço."
 
 #: ../plugins/terracer/src/terracer/HouseNumberInputHandler.java:150
@@ -17593,7 +16322,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:43
 #, java-format
-msgid ""
-"Warning: turnrestrictions plugin replaces already existing action ''{0}'' "
-"behind shortcut ''{1}'' by action ''{2}''"
+msgid "Warning: turnrestrictions plugin replaces already existing action ''{0}'' behind shortcut ''{1}'' by action ''{2}''"
 msgstr ""
 
@@ -17601,7 +16328,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:111
 #, java-format
-msgid ""
-"Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to "
-"default value ''shift ctrl T''."
+msgid "Warning: illegal value ''{0}'' for preference key ''{1}''. Falling back to default value ''shift ctrl T''."
 msgstr ""
 
@@ -17612,16 +16337,30 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
 msgid "Create or edit a turn restriction."
-msgstr ""
+msgstr "Crie ou edite uma restrição de conversão"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:42
-msgid ""
-"In the following table you can edit the <strong>raw tags</strong> of the OSM "
-"relation representing this turn restriction."
+msgid "In the following table you can edit the <strong>raw tags</strong> of the OSM relation representing this turn restriction."
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/AdvancedEditorPanel.java:62
-msgid ""
-"In the following table you can edit the <strong>raw members</strong> of the "
-"OSM relation representing this turn restriction."
+msgid "In the following table you can edit the <strong>raw members</strong> of the OSM relation representing this turn restriction."
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Tipo"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "De ..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
 msgstr ""
 
@@ -17638,7 +16377,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/RelationMemberEditorModel.java:426
 #, java-format
-msgid ""
-"Cannot add object ''{0}'' as relation member because it is deleted or "
-"invisible in layer ''{1}''"
+msgid "Cannot add object ''{0}'' as relation member because it is deleted or invisible in layer ''{1}''"
 msgstr ""
 
@@ -17661,5 +16398,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
 msgid "Edit basic attributes of a turn restriction"
-msgstr ""
+msgstr "Edite os atributos básicos de uma restrição de conversão"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
@@ -17692,10 +16429,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:398
 #, java-format
-msgid ""
-"There is still an unresolved error or warning identified for this turn "
-"restriction. You are recommended to resolve this issue first."
-msgid_plural ""
-"There are still {0} errors and/or warnings identified for this turn "
-"restriction. You are recommended to resolve these issues first."
+msgid "There is still an unresolved error or warning identified for this turn restriction. You are recommended to resolve this issue first."
+msgid_plural "There are still {0} errors and/or warnings identified for this turn restriction. You are recommended to resolve these issues first."
 msgstr[0] ""
 msgstr[1] ""
@@ -17727,17 +16460,11 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:484
 #, java-format
-msgid ""
-"This turn restriction refers to an object which was deleted outside of this "
-"turn restriction editor:"
-msgid_plural ""
-"This turn restriction refers to {0} which were deleted outside of this turn "
-"restriction editor:"
+msgid "This turn restriction refers to an object which was deleted outside of this turn restriction editor:"
+msgid_plural "This turn restriction refers to {0} which were deleted outside of this turn restriction editor:"
 msgstr[0] ""
 msgstr[1] ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:497
-msgid ""
-"Updates to this turn restriction can''t be saved unless deleted members are "
-"removed.<br>How to you want to proceed?"
+msgid "Updates to this turn restriction can''t be saved unless deleted members are removed.<br>How to you want to proceed?"
 msgstr ""
 
@@ -17765,19 +16492,28 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:610
-msgid ""
-"<html>This turn restriction has been changed outside of the editor.<br>You "
-"cannot apply your changes and continue editing.<br><br>Do you want to create "
-"a conflict and close the editor?</html>"
+msgid "<html>This turn restriction has been changed outside of the editor.<br>You cannot apply your changes and continue editing.<br><br>Do you want to create a conflict and close the editor?</html>"
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:627
 #, java-format
-msgid ""
-"<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please "
-"resolve this conflict first, then try again.</html>"
+msgid "<html>Layer ''{0}'' already has a conflict for object<br>''{1}''.<br>Please resolve this conflict first, then try again.</html>"
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Remover da restrição de conversão"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Remover da restrição de conversão"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17863,36 +16599,34 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:59
-msgid ""
-"Select the vehicle types this turn restriction is <strong>not</strong> "
-"applicable for."
-msgstr ""
+msgid "Select the vehicle types this turn restriction is <strong>not</strong> applicable for."
+msgstr "Selecione os tipos de veículos em que esta restrição de conversão <strong>não</strong> se aplica."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:82
 msgid "Public Service Vehicles"
-msgstr ""
+msgstr "Veículos de Serviço Públicos"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:83
 msgid "Public service vehicles like buses, tramways, etc."
-msgstr ""
+msgstr "Veículos de Serviço Público como ônibus, bondes, etc."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:95
 msgid "Heavy Goods Vehicles"
-msgstr ""
+msgstr "Veículos de Carga Pesada"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:108
 msgid "Motorcars"
-msgstr ""
+msgstr "Automóveis"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:122
 msgid "Bicycles"
-msgstr ""
+msgstr "Motocicletas"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:193
 msgid "Use standard exceptions"
-msgstr ""
+msgstr "Usar exceções padrão"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/VehicleExceptionEditor.java:203
 msgid "Use non-standard exceptions"
-msgstr ""
+msgstr "usar exceções não-padrão"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
@@ -17918,7 +16652,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
 #, java-format
-msgid ""
-"Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as "
-"''via''."
+msgid "Failed to retrieve OSM object with id {0} from dataset {1}. Cannot add it as ''via''."
 msgstr ""
 
@@ -17948,8 +16680,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionsListDialog.java:106
-msgid ""
-"<html>Select to display turn restrictions related to object in the current "
-"selection only.<br>Deselect to display all turn restrictions in the current "
-"data set.</html>"
+msgid "<html>Select to display turn restrictions related to object in the current selection only.<br>Deselect to display all turn restrictions in the current data set.</html>"
 msgstr ""
 
@@ -17988,7 +16717,5 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferenceEditor.java:57
-msgid ""
-"Development of the turn restriction plugin was sponsored by <a href=\"http://"
-"www.skobbler.de\">skobbler GmbH</a>."
+msgid "Development of the turn restriction plugin was sponsored by <a href=\"http://www.skobbler.de\">skobbler GmbH</a>."
 msgstr ""
 
@@ -18006,38 +16733,31 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:50
-msgid ""
-"The Basic Editor can optionally display the list of via-objects of a turn "
-"restriction. If enabled, one can edit them in the Basic editor too. If "
-"disabled, editing of via-objects is possible in the Advanced Editor only."
-msgstr ""
+msgid "The Basic Editor can optionally display the list of via-objects of a turn restriction. If enabled, one can edit them in the Basic editor too. If disabled, editing of via-objects is possible in the Advanced Editor only."
+msgstr "O editor básico pode, opcionalmente, mostrar a lista de objetos-via de uma restrição de conversão. Se estiver habilitado, você também vai poder editá-lo no editor básico. Se estiver desabilitado, a edição de objetos-via será possível apenas no editor avançado."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr ""
+msgstr "Exibir e editar lista de objetos-via no Editor Básico"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
 msgid "Road signs - Set A"
-msgstr ""
+msgstr "Placas de trânsito - Grupo A"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:107
 msgid "Road signs - Set B"
-msgstr ""
+msgstr "Placas de Trânsito - Grupo B"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:131
 msgid "Please select the set of road sign icons to be used in the plugin."
-msgstr ""
+msgstr "Por favor selecione um grupo de ícones de placas de trânsito, para serem usados no plugin"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:188
 #, java-format
-msgid ""
-"Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. "
-"Assuming the default value ''set-a''."
+msgid "Warning: the preference with key ''{0}'' has an unsupported value ''{1}''. Assuming the default value ''set-a''."
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:48
-msgid ""
-"Please configure the <strong>keyboard shortcut</strong> which triggers "
-"creating/editing a turn restriction from the current JOSM selection."
-msgstr ""
+msgid "Please configure the <strong>keyboard shortcut</strong> which triggers creating/editing a turn restriction from the current JOSM selection."
+msgstr "Por gentileza configure um <strong>atalho de teclado</strong> que disparará a criação ou edição de restrições de conversão a partir da seleção atual do JOSM."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/ShortcutPreferencePanel.java:64
@@ -18073,10 +16793,6 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:29
 #, java-format
-msgid ""
-"This turn restriction uses the OSM way <span class=\"object-name\">{0}</"
-"span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In "
-"a turn restriction, the way with role <tt>from</tt> should be different from "
-"the way with role <tt>to</tt>, though."
-msgstr ""
+msgid "This turn restriction uses the OSM way <span class=\"object-name\">{0}</span> with role <tt>from</tt> <strong>and</strong> with role <tt>to</tt>. In a turn restriction, the way with role <tt>from</tt> should be different from the way with role <tt>to</tt>, though."
+msgstr "Esta restrição de conversão usa o caminho do OSM <span class=\"object-name\">{0}</span> com a regra <tt>from</tt> <strong>e</strong> com a regra <tt>to</tt>. Em uma restrição de conversão, o caminho com a regra <tt>from</tt> deve ser diferente do caminho com a regra <tt>to</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:37
@@ -18107,14 +16823,10 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IdenticalTurnRestrictionLegsError.java:58
-msgid ""
-"Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
+msgid "Go to Basic Editor and manually choose members with roles ''from'' and ''to''"
 msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IllegalRestrictionTypeError.java:27
 #, java-format
-msgid ""
-"This turn restriction uses a non-standard restriction type <tt>{0}</tt> for "
-"the tag key <tt>restriction</tt>. It is recommended to use standard values "
-"only. Please select one in the Basic editor."
+msgid "This turn restriction uses a non-standard restriction type <tt>{0}</tt> for the tag key <tt>restriction</tt>. It is recommended to use standard values only. Please select one in the Basic editor."
 msgstr ""
 
@@ -18122,15 +16834,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
 msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "Vá para o editor Básico e escolha manualmente o tipo de restrição de conversão."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
 #, java-format
-msgid ""
-"The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the "
-"<strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at "
-"node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">"
-"{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to "
-"set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-"
-"object."
+msgid "The <strong>from</strong>-way <span class=\"object-name\">{0}</span> and the <strong>to</strong>-way <span class=\"object-name\">{1}</span> interesect at node <span class=\"object-name\">{2}</span> but <span class=\"object-name\">{2}</span> isn''t a <strong>via</strong>-object.<br> It is recommended to set <span class=\"object-name\">{2}</span> as unique <strong>via</strong>-object."
 msgstr ""
 
@@ -18140,26 +16846,22 @@
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
-msgid ""
-"Replaces the currently configured via-objects with the node at the "
-"intersection"
-msgstr ""
+msgid "Replaces the currently configured via-objects with the node at the intersection"
+msgstr "Substitui os objetos-via atualmente configurados com o nó da interseção"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
+msgstr "Vá para o Editor Básico e corrija manualmente a lista de objetos-via"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
-msgid ""
-"A turn restriction must declare the type of restriction. Please select a "
-"type in the Basic Editor."
-msgstr ""
+msgid "A turn restriction must declare the type of restriction. Please select a type in the Basic Editor."
+msgstr "Uma restrição de conversão deve ter declarado o seu tipo. Por favor selecione o tipo no Editor Básico."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
 msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "É obrigatório ter em uma restrição de conversão um caminho OSM com a regra <tt>from</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "É obrigatório ter em uma restrição de conversão um caminho OSM com a regra <tt>to</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
@@ -18181,15 +16883,11 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
 #, java-format
-msgid ""
-"A turn restriction requires exactly one way with role <tt>from</tt>. This "
-"turn restriction has {0} ways in this role. Please remove {1} of them."
-msgstr ""
+msgid "A turn restriction requires exactly one way with role <tt>from</tt>. This turn restriction has {0} ways in this role. Please remove {1} of them."
+msgstr "Uma restrição de conversão deve ter exatamente um caminho com a regra <tt>from</tt>. Esta restrição de conversão tem {0} caminhos com esta regra. Por favor remova {1} deles."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
 #, java-format
-msgid ""
-"A turn restriction requires exactly one way with role <tt>to</tt>. This turn "
-"restriction has {0} ways in this role. Please remove {1} of them."
-msgstr ""
+msgid "A turn restriction requires exactly one way with role <tt>to</tt>. This turn restriction has {0} ways in this role. Please remove {1} of them."
+msgstr "Uma restrição de conversão deve ter exatamente um caminho com a regra <tt>to</tt>. Esta restrição de conversão tem {0} caminhos com esta regra. Por favor remova {1} deles."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
@@ -18199,7 +16897,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
 #, java-format
-msgid ""
-"The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is "
-"recommended to use standard values for <tt>except</tt> only."
+msgid "The tag <tt>except</tt> has the non-standard value <tt>{0}</tt>. It is recommended to use standard values for <tt>except</tt> only."
 msgstr ""
 
@@ -18225,8 +16921,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:61
 #, 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>."
+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 ""
 
@@ -18241,14 +16934,10 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
 #, java-format
-msgid ""
-"This turn restriction uses the OSM node <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+msgid "This turn restriction uses the OSM 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 OSM relation <span class=\"object-name\">{0}</"
-"span> as member with role <tt>{1}</tt>."
+msgid "This turn restriction uses the OSM relation <span class=\"object-name\">{0}</span> as member with role <tt>{1}</tt>."
 msgstr ""
 
@@ -18320,7 +17009,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/PreferenceEditor.java:100
-msgid ""
-"An OSM data validator that checks for common errors made by users and editor "
-"programs."
+msgid "An OSM data validator that checks for common errors made by users and editor programs."
 msgstr ""
 
@@ -18477,10 +17164,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:48
-msgid ""
-"This test checks if two roads, railways, waterways or buildings crosses in "
-"the same layer, but are not connected by a node."
-msgstr ""
-"Este teste verifica se duas estradas, ferrovias, hidrovias ou edifícios se "
-"cruzam na mesma camada, mas não estão ligados por um nó."
+msgid "This test checks if two roads, railways, waterways or buildings crosses in the same layer, but are not connected by a node."
+msgstr "Este teste verifica se duas estradas, ferrovias, hidrovias ou edifícios se cruzam na mesma camada, mas não estão ligados por um nó."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/CrossingWays.java:126
@@ -18511,10 +17194,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:65
-msgid ""
-"This test checks that there are no ways with same tags and same node "
-"coordinates."
-msgstr ""
-"Este teste verifica se não há vias com as mesmas etiquetas e mesmas "
-"coordenadas de nós."
+msgid "This test checks that there are no ways with same tags and same node coordinates."
+msgstr "Este teste verifica se não há vias com as mesmas etiquetas e mesmas coordenadas de nós."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicateWay.java:169
@@ -18536,5 +17215,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolígono"
@@ -18573,8 +17252,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:37
-msgid ""
-"This test finds multilingual objects whose 'name' attribute is not equal to "
-"some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., "
-"Italia - Italien - Italy."
+msgid "This test finds multilingual objects whose 'name' attribute is not equal to some 'name:*' attribute and not a composition of 'name:*' attributes, e.g., Italia - Italien - Italy."
 msgstr ""
 
@@ -18601,10 +17277,6 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:45
-msgid ""
-"This test checks that a connection between two nodes is not used by more "
-"than one way."
-msgstr ""
-"Este teste verifica se uma conexão entre dois nós não é usada por mais de "
-"uma via."
+msgid "This test checks that a connection between two nodes is not used by more than one way."
+msgstr "Este teste verifica se uma conexão entre dois nós não é usada por mais de uma via."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/OverlappingWays.java:108
@@ -18642,6 +17314,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SelfIntersectingWay.java:23
-msgid ""
-"This test checks for ways that contain some of their nodes more than once."
+msgid "This test checks for ways that contain some of their nodes more than once."
 msgstr ""
 
@@ -18652,6 +17323,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/SimilarNamedWays.java:40
-msgid ""
-"This test checks for ways with similar names that may have been misspelled."
+msgid "This test checks for ways with similar names that may have been misspelled."
 msgstr ""
 
@@ -18765,7 +17435,5 @@
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:703
-msgid ""
-"The sources (URL or filename) of spell check (see http://wiki.openstreetmap."
-"org/index.php/User:JLS/speller) or tag checking data files."
+msgid "The sources (URL or filename) of spell check (see http://wiki.openstreetmap.org/index.php/User:JLS/speller) or tag checking data files."
 msgstr ""
 
@@ -18991,6 +17659,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:36
 msgid "This test checks the direction of water, land and coastline ways."
-msgstr ""
-"Este teste verifica a direção dos caminhos de água, de terra e de litoral."
+msgstr "Este teste verifica a direção dos caminhos de água, de terra e de litoral."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/WronglyOrderedWays.java:70
@@ -19016,11 +17683,9 @@
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:24
-msgid ""
-"Display a map that was previously scanned and uploaded to walking-papers.org"
+msgid "Display a map that was previously scanned and uploaded to walking-papers.org"
 msgstr ""
 
 #: ../plugins/walkingpapers/src/org/openstreetmap/josm/plugins/walkingpapers/WalkingPapersAddLayerAction.java:29
-msgid ""
-"Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
+msgid "Enter a walking-papers.org URL or ID (the bit after the ?id= in the URL)"
 msgstr ""
 
@@ -19054,8 +17719,5 @@
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:100
-msgid ""
-"<html>Neither a node nor a way with an endpoint outside of the<br>current "
-"download areas is selected.<br>Select a node on the start or end of a way or "
-"an entire way first.</html>"
+msgid "<html>Neither a node nor a way with an endpoint outside of the<br>current download areas is selected.<br>Select a node on the start or end of a way or an entire way first.</html>"
 msgstr ""
 
@@ -19071,17 +17733,10 @@
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:169
 #, java-format
-msgid ""
-"Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t "
-"discovered after download"
+msgid "Way downloader data inconsistency. Prior connected way ''{0}'' wasn''t discovered after download"
 msgstr ""
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:183
 #, java-format
-msgid ""
-"<html>There aren''t further connected ways to download.<br>A potential "
-"duplicate node of the currently selected node was found, though.<br><br>The "
-"currently selected node is ''{0}''<br>The potential duplicate node is "
-"''{1}''<br>Merge the duplicate node onto the currently selected node and "
-"continue way downloading?</html>"
+msgid "<html>There aren''t further connected ways to download.<br>A potential duplicate node of the currently selected node was found, though.<br><br>The currently selected node is ''{0}''<br>The potential duplicate node is ''{1}''<br>Merge the duplicate node onto the currently selected node and continue way downloading?</html>"
 msgstr ""
 
@@ -19110,5 +17765,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
 msgid "Exception occurred"
-msgstr ""
+msgstr "Uma exceção ocorreu"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
@@ -19156,7 +17811,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:201
-msgid ""
-"Couldn't match the entered link or id to the selected service. Please try "
-"again."
+msgid "Couldn't match the entered link or id to the selected service. Please try again."
 msgstr ""
 
@@ -19196,13 +17849,9 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:117
 #, java-format
-msgid ""
-"Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' "
-"or a trailing '?'."
+msgid "Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' or a trailing '?'."
 msgstr ""
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSGrabber.java:118
-msgid ""
-"Warning: Fetching WMS tiles is likely to fail. Please check you preference "
-"settings."
+msgid "Warning: Fetching WMS tiles is likely to fail. Please check you preference settings."
 msgstr ""
 
@@ -19244,9 +17893,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:206
 #, java-format
-msgid ""
-"<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a "
-"''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. "
-"You should check your<br>preference settings.<br>Do you want to fetch WMS "
-"tiles anyway?"
+msgid "<html>The base URL<br>''{0}''<br>for this WMS layer does neither end with a ''&'' nor with a ''?''.<br>This is likely to lead to invalid WMS request. You should check your<br>preference settings.<br>Do you want to fetch WMS tiles anyway?"
 msgstr ""
 
@@ -19264,6 +17909,5 @@
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:312
-msgid ""
-"The requested area is too big. Please zoom in a little, or change resolution"
+msgid "The requested area is too big. Please zoom in a little, or change resolution"
 msgstr ""
 
@@ -19385,10 +18029,6 @@
 #.
 #: build/specialmessages.java:6
-msgid ""
-"You requested too many nodes (limit is 50,000). Either request a smaller "
-"area, or use planet.osm"
-msgstr ""
-"Você requisitou muitos nós (o limite é 50.000). Requisite uma área menor ou "
-"use planet.osm"
+msgid "You requested too many nodes (limit is 50,000). Either request a smaller area, or use planet.osm"
+msgstr "Você requisitou muitos nós (o limite é 50.000). Requisite uma área menor ou use planet.osm"
 
 #. OSM server message
@@ -19399,7 +18039,5 @@
 #. OSM server message
 #: build/specialmessages.java:8
-msgid ""
-"The maximum bbox size is 0.25, and your request was too large. Either "
-"request a smaller area, or use planet.osm"
+msgid "The maximum bbox size is 0.25, and your request was too large. Either request a smaller area, or use planet.osm"
 msgstr ""
 
@@ -19421,7 +18059,5 @@
 #. Plugin AddrInterpolation
 #: build/trans_plugins.java:3
-msgid ""
-"Group common Address Interpolation inputs in a single dialog, as well as an "
-"option to automatically generate individual house number nodes from a Way."
+msgid "Group common Address Interpolation inputs in a single dialog, as well as an option to automatically generate individual house number nodes from a Way."
 msgstr ""
 
@@ -19438,10 +18074,5 @@
 #. Plugin colorscheme
 #: build/trans_plugins.java:9
-msgid ""
-"Allows the user to create different color schemes and to switch between "
-"them. Just change the colors and create a new scheme. Used to switch to a "
-"white background with matching colors for better visibility in bright "
-"sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but "
-"true :-)"
+msgid "Allows the user to create different color schemes and to switch between them. Just change the colors and create a new scheme. Used to switch to a white background with matching colors for better visibility in bright sunlight. See dialog in JOSM's preferences and 'Map Settings' (strange but true :-)"
 msgstr ""
 
@@ -19453,6 +18084,5 @@
 #. Plugin czechaddress
 #: build/trans_plugins.java:13
-msgid ""
-"Creating and handling address nodes and buildings within Czech Republic."
+msgid "Creating and handling address nodes and buildings within Czech Republic."
 msgstr ""
 
@@ -19464,7 +18094,5 @@
 #. Plugin DirectUpload
 #: build/trans_plugins.java:17
-msgid ""
-"This plugin directly upload GPS Traces from current active layer in JOSM to "
-"openstreetmap.org."
+msgid "This plugin directly upload GPS Traces from current active layer in JOSM to openstreetmap.org."
 msgstr ""
 
@@ -19476,10 +18104,6 @@
 #. Plugin editgpx
 #: build/trans_plugins.java:21
-msgid ""
-"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
-"very fast."
-msgstr ""
-"permite que o usuário anonimize informações de tempo e remova partes de uma "
-"trilha GPS gigante de forma muito rápida."
+msgid "Allows the user to anonymize timestamps and delete parts of huge GPX tracks very fast."
+msgstr "permite que o usuário anonimize informações de tempo e remova partes de uma trilha GPS gigante de forma muito rápida."
 
 #. Plugin globalsat
@@ -19500,8 +18124,5 @@
 #. Plugin ImageWayPoint
 #: build/trans_plugins.java:29
-msgid ""
-"Another plugin to match images to the waypoints in a GPX file. A match is "
-"made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches "
-"the filename of an image."
+msgid "Another plugin to match images to the waypoints in a GPX file. A match is made when the 'name', 'cmt' or 'desc' attribute of a waypoint tag matches the filename of an image."
 msgstr ""
 
@@ -19513,14 +18134,10 @@
 #. Plugin livegps
 #: build/trans_plugins.java:33
-msgid ""
-"Support live GPS input (moving dot) through a connection to gpsd server."
+msgid "Support live GPS input (moving dot) through a connection to gpsd server."
 msgstr ""
 
 #. Plugin measurement
 #: build/trans_plugins.java:35
-msgid ""
-"Provide a measurement dialog and a layer to measure length and angle of "
-"segments, area surrounded by a (simple) closed way and create measurement "
-"paths (which also can be imported from a gps layer)."
+msgid "Provide a measurement dialog and a layer to measure length and angle of segments, area surrounded by a (simple) closed way and create measurement paths (which also can be imported from a gps layer)."
 msgstr ""
 
@@ -19537,15 +18154,10 @@
 #. Plugin multipoly
 #: build/trans_plugins.java:41
-msgid ""
-"Create multipolygons by one click, much easier than standard way with "
-"relation editor."
+msgid "Create multipolygons by one click, much easier than standard way with relation editor."
 msgstr ""
 
 #. Plugin nearclick
 #: build/trans_plugins.java:43
-msgid ""
-"Simulates a click when you do a small and short drag. This is useful for "
-"tablet pens, when you have problems just clicking the tablet without the "
-"mouse moving (general Java - tablet problem)."
+msgid "Simulates a click when you do a small and short drag. This is useful for tablet pens, when you have problems just clicking the tablet without the mouse moving (general Java - tablet problem)."
 msgstr ""
 
@@ -19562,28 +18174,20 @@
 #. Plugin openvisible
 #: build/trans_plugins.java:49
-msgid ""
-"Allows opening gpx/osm files that intersect the currently visible screen area"
+msgid "Allows opening gpx/osm files that intersect the currently visible screen area"
 msgstr ""
 
 #. Plugin osmarender
 #: build/trans_plugins.java:51
-msgid ""
-"Launches FireFox to display the current visible screen as a nice SVG image."
+msgid "Launches FireFox to display the current visible screen as a nice SVG image."
 msgstr ""
 
 #. Plugin photo_geotagging
 #: build/trans_plugins.java:53
-msgid ""
-"Write gps position info to the image file header. Run this feature from the "
-"right click menu of the image layer."
-msgstr ""
-"Escreva informações de posicionamento GPS no cabeçalho do arquivo de imagem. "
-"Pode-se executar esta funcionalidade no menu de contexto da camada de imagem."
+msgid "Write gps position info to the image file header. Run this feature from the right click menu of the image layer."
+msgstr "Escreva informações de posicionamento GPS no cabeçalho do arquivo de imagem. Pode-se executar esta funcionalidade no menu de contexto da camada de imagem."
 
 #. Plugin PicLayer
 #: build/trans_plugins.java:55
-msgid ""
-"This plugin allows to display any picture as a background in the editor and "
-"align it with the map."
+msgid "This plugin allows to display any picture as a background in the editor and align it with the map."
 msgstr ""
 
@@ -19595,6 +18199,5 @@
 #. Plugin public_transport
 #: build/trans_plugins.java:59
-msgid ""
-"This plugin simplifies the mapping and editing of public transport routes."
+msgid "This plugin simplifies the mapping and editing of public transport routes."
 msgstr ""
 
@@ -19606,7 +18209,5 @@
 #. Plugin routes
 #: build/trans_plugins.java:63
-msgid ""
-"Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be "
-"defined in routes.xml file in plugin directory"
+msgid "Renders routes (bus, hiking trails, bicycle routes, ..). Route types must be defined in routes.xml file in plugin directory"
 msgstr ""
 
@@ -19618,7 +18219,5 @@
 #. Plugin slippymap
 #: build/trans_plugins.java:67
-msgid ""
-"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
-"background and request updates."
+msgid "Displays a slippy map grid in JOSM. Can load tiles from slippy map as background and request updates."
 msgstr ""
 
@@ -19635,8 +18234,5 @@
 #. Plugin tagging-preset-tester
 #: build/trans_plugins.java:73
-msgid ""
-"Adds a tagging preset tester to the help menu, which helps you developing of "
-"tagging presets (quick preview of the dialog that will popup). You can start "
-"the jar-file as standalone as well."
+msgid "Adds a tagging preset tester to the help menu, which helps you developing of tagging presets (quick preview of the dialog that will popup). You can start the jar-file as standalone as well."
 msgstr ""
 
@@ -19648,28 +18244,20 @@
 #. Plugin Tracer
 #: build/trans_plugins.java:77
-msgid ""
-"Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) "
-"to be running."
+msgid "Traces buildings from Czech cadastral map. Needs TracerServer (.NET or Mono) to be running."
 msgstr ""
 
 #. Plugin turnrestrictions
 #: build/trans_plugins.java:79
-msgid ""
-"The turnrestrictions plugin allows to create and edit turn restrictions in "
-"the OpenStreetMap database."
+msgid "The turnrestrictions plugin allows to create and edit turn restrictions in the OpenStreetMap database."
 msgstr ""
 
 #. Plugin validator
 #: build/trans_plugins.java:81
-msgid ""
-"An OSM data validator. It checks for problems in data, and provides fixes "
-"for the common ones. Spellcheck integrated for tag names."
+msgid "An OSM data validator. It checks for problems in data, and provides fixes for the common ones. Spellcheck integrated for tag names."
 msgstr ""
 
 #. Plugin walkingpapers
 #: build/trans_plugins.java:83
-msgid ""
-"Supports downloading tiled, scanned maps from walking-papers.org. This "
-"plugin is still under early development and may be buggy."
+msgid "Supports downloading tiled, scanned maps from walking-papers.org. This plugin is still under early development and may be buggy."
 msgstr ""
 
@@ -19686,16 +18274,11 @@
 #. Plugin wms-turbo-challenge2
 #: build/trans_plugins.java:89
-msgid ""
-"Drive a race car from point A to point B over aerial imagery, leave cacti "
-"behind."
+msgid "Drive a race car from point A to point B over aerial imagery, leave cacti behind."
 msgstr ""
 
 #. Plugin wmsplugin
 #: build/trans_plugins.java:91
-msgid ""
-"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
-msgstr ""
-"Mostrar imagens georeferenciadas como fundo no JOSM (servidores WMS, "
-"Yahoo, ...)."
+msgid "Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
+msgstr "Mostrar imagens georeferenciadas como fundo no JOSM (servidores WMS, Yahoo, ...)."
 
 #. <!--
@@ -19770,5 +18353,6 @@
 #. <action class="SetWaypointAction" params="Exit"/>
 #. </button>
-#: build/trans_presets.java:70 build/trans_surveyor.java:72
+#: build/trans_presets.java:70
+#: build/trans_surveyor.java:72
 msgid "Motorway"
 msgstr "Auto-estrada"
@@ -19812,10 +18396,16 @@
 #. item "Man Made/Power Station" text "Operator"
 #. item "Relations/Route" text "Name"
-#: build/trans_presets.java:76 build/trans_presets.java:112
-#: build/trans_presets.java:132 build/trans_presets.java:152
-#: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:76
+#: build/trans_presets.java:112
+#: build/trans_presets.java:132
+#: build/trans_presets.java:152
+#: build/trans_presets.java:189
+#: build/trans_presets.java:209
+#: build/trans_presets.java:1524
+#: build/trans_presets.java:1532
+#: build/trans_presets.java:1540
+#: build/trans_presets.java:1574
+#: build/trans_presets.java:2401
+#: build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referência"
@@ -19829,8 +18419,12 @@
 #. item "Highways/Streets/Secondary" combo "Layer"
 #. item "Highways/Streets/Roundabout" combo "Layer"
-#: build/trans_presets.java:80 build/trans_presets.java:97
-#: build/trans_presets.java:116 build/trans_presets.java:135
-#: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:80
+#: build/trans_presets.java:97
+#: build/trans_presets.java:116
+#: build/trans_presets.java:135
+#: build/trans_presets.java:156
+#: build/trans_presets.java:172
+#: build/trans_presets.java:193
+#: build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Faixas"
@@ -19848,14 +18442,23 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
-#: build/trans_presets.java:81 build/trans_presets.java:98
-#: build/trans_presets.java:117 build/trans_presets.java:136
-#: build/trans_presets.java:157 build/trans_presets.java:173
-#: build/trans_presets.java:194 build/trans_presets.java:213
-#: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#. item "Ways/Dedicated Bridleway" combo "Layer"
+#: build/trans_presets.java:81
+#: build/trans_presets.java:98
+#: build/trans_presets.java:117
+#: build/trans_presets.java:136
+#: build/trans_presets.java:157
+#: build/trans_presets.java:173
+#: build/trans_presets.java:194
+#: build/trans_presets.java:213
+#: build/trans_presets.java:237
+#: build/trans_presets.java:312
+#: build/trans_presets.java:344
+#: build/trans_presets.java:364
+#: build/trans_presets.java:386
+#: build/trans_presets.java:426
+#: build/trans_presets.java:441
+#: build/trans_presets.java:495
+#: build/trans_presets.java:514
+#: build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Velocidade máxima (km/h)"
@@ -19883,30 +18486,36 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
-#: build/trans_presets.java:82 build/trans_presets.java:99
-#: build/trans_presets.java:118 build/trans_presets.java:137
-#: build/trans_presets.java:158 build/trans_presets.java:174
-#: build/trans_presets.java:195 build/trans_presets.java:214
-#: build/trans_presets.java:230 build/trans_presets.java:249
-#: build/trans_presets.java:267 build/trans_presets.java:285
-#: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:82
+#: build/trans_presets.java:99
+#: build/trans_presets.java:118
+#: build/trans_presets.java:137
+#: build/trans_presets.java:158
+#: build/trans_presets.java:174
+#: build/trans_presets.java:195
+#: build/trans_presets.java:214
+#: build/trans_presets.java:230
+#: build/trans_presets.java:249
+#: build/trans_presets.java:267
+#: build/trans_presets.java:285
+#: build/trans_presets.java:304
+#: build/trans_presets.java:325
+#: build/trans_presets.java:337
+#: build/trans_presets.java:356
+#: build/trans_presets.java:373
+#: build/trans_presets.java:405
+#: build/trans_presets.java:462
+#: build/trans_presets.java:486
+#: build/trans_presets.java:508
+#: build/trans_presets.java:528
+#: build/trans_presets.java:551
+#: build/trans_presets.java:573
+#: build/trans_presets.java:611
+#: build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Mão Única"
@@ -19926,15 +18535,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19945,17 +18552,30 @@
 #. <!--action class="SystemExecuteAction" params="mplayer,-quiet,/usr/share/apps/klettres/de/alpha/x.ogg"/-->
 #. </button>
-#: build/trans_presets.java:83 build/trans_presets.java:100
-#: build/trans_presets.java:120 build/trans_presets.java:139
-#: build/trans_presets.java:160 build/trans_presets.java:176
-#: build/trans_presets.java:196 build/trans_presets.java:215
-#: build/trans_presets.java:231 build/trans_presets.java:250
-#: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:83
+#: build/trans_presets.java:100
+#: build/trans_presets.java:120
+#: build/trans_presets.java:139
+#: build/trans_presets.java:160
+#: build/trans_presets.java:176
+#: build/trans_presets.java:196
+#: build/trans_presets.java:215
+#: build/trans_presets.java:231
+#: build/trans_presets.java:250
+#: build/trans_presets.java:268
+#: build/trans_presets.java:286
+#: build/trans_presets.java:305
+#: build/trans_presets.java:338
+#: build/trans_presets.java:357
+#: build/trans_presets.java:406
+#: build/trans_presets.java:415
+#: build/trans_presets.java:458
+#: build/trans_presets.java:482
+#: build/trans_presets.java:509
+#: build/trans_presets.java:529
+#: build/trans_presets.java:552
+#: build/trans_presets.java:574
+#: build/trans_presets.java:592
+#: build/trans_presets.java:612
+#: build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19976,8 +18596,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19989,17 +18609,30 @@
 #. item "Ways/Steps" check "Bridge"
 #. item "Transport/Railway/Bus Guideway" check "Bridge"
-#: build/trans_presets.java:84 build/trans_presets.java:101
-#: build/trans_presets.java:121 build/trans_presets.java:140
-#: build/trans_presets.java:161 build/trans_presets.java:177
-#: build/trans_presets.java:197 build/trans_presets.java:216
-#: build/trans_presets.java:232 build/trans_presets.java:251
-#: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:84
+#: build/trans_presets.java:101
+#: build/trans_presets.java:121
+#: build/trans_presets.java:140
+#: build/trans_presets.java:161
+#: build/trans_presets.java:177
+#: build/trans_presets.java:197
+#: build/trans_presets.java:216
+#: build/trans_presets.java:232
+#: build/trans_presets.java:251
+#: build/trans_presets.java:269
+#: build/trans_presets.java:287
+#: build/trans_presets.java:306
+#: build/trans_presets.java:339
+#: build/trans_presets.java:358
+#: build/trans_presets.java:407
+#: build/trans_presets.java:431
+#: build/trans_presets.java:459
+#: build/trans_presets.java:483
+#: build/trans_presets.java:510
+#: build/trans_presets.java:530
+#: build/trans_presets.java:553
+#: build/trans_presets.java:575
+#: build/trans_presets.java:593
+#: build/trans_presets.java:613
+#: build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Túnel"
@@ -20019,6 +18652,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20030,17 +18663,29 @@
 #. item "Ways/Steps" check "Tunnel"
 #. item "Transport/Railway/Bus Guideway" check "Tunnel"
-#: build/trans_presets.java:85 build/trans_presets.java:102
-#: build/trans_presets.java:122 build/trans_presets.java:141
-#: build/trans_presets.java:162 build/trans_presets.java:178
-#: build/trans_presets.java:198 build/trans_presets.java:217
-#: build/trans_presets.java:233 build/trans_presets.java:252
-#: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:85
+#: build/trans_presets.java:102
+#: build/trans_presets.java:122
+#: build/trans_presets.java:141
+#: build/trans_presets.java:162
+#: build/trans_presets.java:178
+#: build/trans_presets.java:198
+#: build/trans_presets.java:217
+#: build/trans_presets.java:233
+#: build/trans_presets.java:252
+#: build/trans_presets.java:270
+#: build/trans_presets.java:288
+#: build/trans_presets.java:307
+#: build/trans_presets.java:340
+#: build/trans_presets.java:359
+#: build/trans_presets.java:408
+#: build/trans_presets.java:460
+#: build/trans_presets.java:484
+#: build/trans_presets.java:511
+#: build/trans_presets.java:531
+#: build/trans_presets.java:554
+#: build/trans_presets.java:576
+#: build/trans_presets.java:594
+#: build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Corte"
@@ -20060,6 +18705,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20071,17 +18716,29 @@
 #. item "Ways/Steps" check "Cutting"
 #. item "Transport/Railway/Bus Guideway" check "Cutting"
-#: build/trans_presets.java:86 build/trans_presets.java:103
-#: build/trans_presets.java:123 build/trans_presets.java:142
-#: build/trans_presets.java:163 build/trans_presets.java:179
-#: build/trans_presets.java:199 build/trans_presets.java:218
-#: build/trans_presets.java:234 build/trans_presets.java:253
-#: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:86
+#: build/trans_presets.java:103
+#: build/trans_presets.java:123
+#: build/trans_presets.java:142
+#: build/trans_presets.java:163
+#: build/trans_presets.java:179
+#: build/trans_presets.java:199
+#: build/trans_presets.java:218
+#: build/trans_presets.java:234
+#: build/trans_presets.java:253
+#: build/trans_presets.java:271
+#: build/trans_presets.java:289
+#: build/trans_presets.java:308
+#: build/trans_presets.java:341
+#: build/trans_presets.java:360
+#: build/trans_presets.java:409
+#: build/trans_presets.java:461
+#: build/trans_presets.java:485
+#: build/trans_presets.java:512
+#: build/trans_presets.java:532
+#: build/trans_presets.java:555
+#: build/trans_presets.java:577
+#: build/trans_presets.java:595
+#: build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -20117,6 +18774,8 @@
 #. item "Highways/Streets/Primary" check "Oneway"
 #. item "Highways/Streets/Primary Link" check "Oneway"
-#: build/trans_presets.java:119 build/trans_presets.java:138
-#: build/trans_presets.java:159 build/trans_presets.java:175
+#: build/trans_presets.java:119
+#: build/trans_presets.java:138
+#: build/trans_presets.java:159
+#: build/trans_presets.java:175
 msgid "Motorroad"
 msgstr ""
@@ -20142,5 +18801,6 @@
 #. <action class="SetWaypointAction" params="Motorway"/>
 #. </button>
-#: build/trans_presets.java:146 build/trans_surveyor.java:76
+#: build/trans_presets.java:146
+#: build/trans_surveyor.java:76
 msgid "Primary"
 msgstr "Primária"
@@ -20170,5 +18830,6 @@
 #. <action class="SetWaypointAction" params="Primary"/>
 #. </button>
-#: build/trans_presets.java:182 build/trans_surveyor.java:80
+#: build/trans_presets.java:182
+#: build/trans_surveyor.java:80
 msgid "Secondary"
 msgstr ""
@@ -20202,5 +18863,6 @@
 #. <action class="SetWaypointAction" params="Secondary"/>
 #. </button>
-#: build/trans_presets.java:221 build/trans_surveyor.java:84
+#: build/trans_presets.java:221
+#: build/trans_surveyor.java:84
 msgid "Unclassified"
 msgstr ""
@@ -20218,6 +18880,8 @@
 #. item "Ways/Combined Foot- and Cycleway" check "Embankment"
 #. item "Ways/Dedicated Footway" check "Embankment"
-#: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:235
+#: build/trans_presets.java:309
+#: build/trans_presets.java:578
+#: build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -20226,26 +18890,39 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
 #. item "Public Transport/Bus Platform" text "Reference (track number)"
-#: build/trans_presets.java:238 build/trans_presets.java:256
-#: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:238
+#: build/trans_presets.java:256
+#: build/trans_presets.java:274
+#: build/trans_presets.java:292
+#: build/trans_presets.java:313
+#: build/trans_presets.java:345
+#: build/trans_presets.java:365
+#: build/trans_presets.java:412
+#: build/trans_presets.java:428
+#: build/trans_presets.java:442
+#: build/trans_presets.java:467
+#: build/trans_presets.java:496
+#: build/trans_presets.java:515
+#: build/trans_presets.java:535
+#: build/trans_presets.java:557
+#: build/trans_presets.java:580
+#: build/trans_presets.java:598
+#: build/trans_presets.java:617
+#: build/trans_presets.java:1247
+#: build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Largura (metros)"
@@ -20257,5 +18934,6 @@
 #. <action class="SetWaypointAction" params="Unclassified"/>
 #. </button>
-#: build/trans_presets.java:241 build/trans_surveyor.java:88
+#: build/trans_presets.java:241
+#: build/trans_surveyor.java:88
 msgid "Residential"
 msgstr "Residencial"
@@ -20274,24 +18952,28 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Superfície"
@@ -20303,5 +18985,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -20313,169 +18995,280 @@
 #. item "Ways/Steps" combo "Surface"
 #. item "Transport/Railway/Bus Guideway" combo "Surface"
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paved"
 msgstr "pavimentada"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "não pavimentada"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "concrete"
 msgstr "concreto"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
+#: build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
+#: build/trans_presets.java:2483
 msgid "wood"
 msgstr "madeira"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "gravel"
 msgstr "pedras"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass"
 msgstr "grama"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "sand"
 msgstr "areia"
 
-#: build/trans_presets.java:255 build/trans_presets.java:273
-#: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:255
+#: build/trans_presets.java:273
+#: build/trans_presets.java:291
+#: build/trans_presets.java:311
+#: build/trans_presets.java:326
+#: build/trans_presets.java:343
+#: build/trans_presets.java:362
+#: build/trans_presets.java:456
+#: build/trans_presets.java:479
+#: build/trans_presets.java:507
+#: build/trans_presets.java:527
+#: build/trans_presets.java:550
+#: build/trans_presets.java:572
+#: build/trans_presets.java:591
+#: build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "ground"
 msgstr "terra"
@@ -20556,6 +19349,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -20564,5 +19356,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -20570,6 +19362,36 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Construção"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Editar Rodovia em Construção"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Junção"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363
+#: build/trans_style.java:898
+msgid "roundabout"
+msgstr "rotatória"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr ""
@@ -20578,15 +19400,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Pedágio"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Sem saída"
@@ -20594,5 +19416,6 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376
+#: build/trans_presets.java:464
 msgid "Access"
 msgstr "Acesso"
@@ -20634,28 +19457,50 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_presets.java:487
+#: build/trans_presets.java:488
+#: build/trans_presets.java:489
+#: build/trans_presets.java:490
+#: build/trans_presets.java:491
+#: build/trans_presets.java:492
+#: build/trans_presets.java:493
+#: build/trans_presets.java:533
+#: build/trans_presets.java:669
+#: build/trans_presets.java:1155
+#: build/trans_presets.java:1167
+#: build/trans_presets.java:1179
+#: build/trans_presets.java:1191
+#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
+#: build/trans_presets.java:1227
+#: build/trans_presets.java:1359
+#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
+#: build/trans_presets.java:1364
+#: build/trans_presets.java:1365
+#: build/trans_presets.java:1484
+#: build/trans_presets.java:1485
+#: build/trans_presets.java:1486
+#: build/trans_presets.java:1778
+#: build/trans_presets.java:1788
+#: build/trans_presets.java:2440
+#: build/trans_presets.java:2441
+#: build/trans_presets.java:2482
+#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
+#: build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "yes"
 msgstr "sim"
@@ -20668,10 +19513,16 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20685,10 +19536,16 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20712,99 +19569,159 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_style.java:205
 msgid "permissive"
 msgstr "permitido"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:376
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_presets.java:481
+#: build/trans_presets.java:487
+#: build/trans_presets.java:488
+#: build/trans_presets.java:489
+#: build/trans_presets.java:490
+#: build/trans_presets.java:491
+#: build/trans_presets.java:492
+#: build/trans_presets.java:493
+#: build/trans_presets.java:533
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1155
+#: build/trans_presets.java:1167
+#: build/trans_presets.java:1179
+#: build/trans_presets.java:1191
+#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
+#: build/trans_presets.java:1227
+#: build/trans_presets.java:1269
+#: build/trans_presets.java:1359
+#: build/trans_presets.java:1360
+#: build/trans_presets.java:1363
+#: build/trans_presets.java:1364
+#: build/trans_presets.java:1365
+#: build/trans_presets.java:1484
+#: build/trans_presets.java:1485
+#: build/trans_presets.java:1486
+#: build/trans_presets.java:1778
+#: build/trans_presets.java:1788
+#: build/trans_presets.java:2440
+#: build/trans_presets.java:2441
+#: build/trans_presets.java:2482
+#: build/trans_presets.java:2491
+#: build/trans_presets.java:2492
+#: build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "não"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_presets.java:487
+#: build/trans_presets.java:488
+#: build/trans_presets.java:489
+#: build/trans_presets.java:491
+#: build/trans_presets.java:492
+#: build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378
+#: build/trans_presets.java:379
+#: build/trans_presets.java:380
+#: build/trans_presets.java:381
+#: build/trans_presets.java:382
+#: build/trans_presets.java:383
+#: build/trans_presets.java:384
+#: build/trans_presets.java:385
+#: build/trans_presets.java:464
+#: build/trans_presets.java:465
+#: build/trans_presets.java:466
+#: build/trans_presets.java:487
+#: build/trans_presets.java:488
+#: build/trans_presets.java:489
+#: build/trans_presets.java:491
+#: build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Carga"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
-msgstr "Veículos de Carga Pesados"
+msgstr "Veículos de Carga Pesada"
 
 #. item "Barriers/Bollard" check "Bicycle"
@@ -20817,10 +19734,15 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382
+#: build/trans_presets.java:489
+#: build/trans_presets.java:746
+#: build/trans_presets.java:779
+#: build/trans_presets.java:801
+#: build/trans_presets.java:838
+#: build/trans_presets.java:851
+#: build/trans_presets.java:863
+#: build/trans_presets.java:875
+#: build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Cavalo"
@@ -20836,10 +19758,16 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383
+#: build/trans_presets.java:465
+#: build/trans_presets.java:747
+#: build/trans_presets.java:765
+#: build/trans_presets.java:780
+#: build/trans_presets.java:802
+#: build/trans_presets.java:839
+#: build/trans_presets.java:852
+#: build/trans_presets.java:864
+#: build/trans_presets.java:876
+#: build/trans_presets.java:888
+#: build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocicleta"
@@ -20854,19 +19782,25 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384
+#: build/trans_presets.java:466
+#: build/trans_presets.java:493
+#: build/trans_presets.java:766
+#: build/trans_presets.java:781
+#: build/trans_presets.java:803
+#: build/trans_presets.java:840
+#: build/trans_presets.java:853
+#: build/trans_presets.java:865
+#: build/trans_presets.java:877
+#: build/trans_presets.java:889
+#: build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Automóvel"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Veículos de Serviço Público"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Velocidade mínima (km/h)"
@@ -20874,20 +19808,21 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388
+#: build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Peso máximo (toneladas)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Altura máxima (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Largura máx. (metros)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Comprimento Máx. (metros)"
@@ -20895,5 +19830,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rotatória"
@@ -20904,5 +19839,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Editar Junção"
@@ -20922,10 +19857,11 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402
+#: build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20947,10 +19883,11 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402
+#: build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20972,10 +19909,11 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402
+#: build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primária"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20997,5 +19935,6 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402
+#: build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21010,9 +19949,10 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402
+#: build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -21026,9 +19966,10 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402
+#: build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -21058,10 +19999,11 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402
+#: build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "serviço"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -21091,6 +20033,8 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
-#: build/trans_style.java:3317 build/trans_style.java:3318
+#: build/trans_presets.java:402
+#: build/trans_style.java:880
+#: build/trans_style.java:3317
+#: build/trans_style.java:3318
 msgid "construction"
 msgstr "construção"
@@ -21101,10 +20045,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Editar Ponte"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Editar Túnel"
@@ -21112,39 +20056,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Vias"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Construção"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Editar Rodovia em Construção"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Junção"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rotatória"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Trilha"
@@ -21153,73 +20068,42 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Editar Trilha"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457
+#: build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "caminhada"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Caminho"
@@ -21228,38 +20112,70 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Edicar Caminho"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478
+#: build/trans_presets.java:3214
+msgid "hiking"
+msgstr "caminhada"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481
+#: build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Ski"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr ""
@@ -21268,5 +20184,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -21274,5 +20190,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -21280,5 +20196,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -21296,11 +20212,12 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522
+#: build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Editar Ciclovia"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -21308,5 +20225,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -21314,5 +20231,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -21320,5 +20237,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -21327,15 +20244,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Editar Calçada"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Escada"
@@ -21345,10 +20258,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Editar Escadaria"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Trevo de Acesso"
@@ -21356,15 +20269,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Editar Trevo de Acesso"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Número"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Serviços"
@@ -21372,5 +20285,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -21410,17 +20323,29 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637
+#: build/trans_presets.java:790
+#: build/trans_presets.java:1330
+#: build/trans_presets.java:1372
+#: build/trans_presets.java:1378
+#: build/trans_presets.java:1386
+#: build/trans_presets.java:1393
+#: build/trans_presets.java:1776
+#: build/trans_presets.java:1786
+#: build/trans_presets.java:2215
+#: build/trans_presets.java:2317
+#: build/trans_presets.java:2347
+#: build/trans_presets.java:2400
+#: build/trans_presets.java:2408
+#: build/trans_presets.java:2425
+#: build/trans_presets.java:2438
+#: build/trans_presets.java:2447
+#: build/trans_presets.java:2454
+#: build/trans_presets.java:2519
+#: build/trans_presets.java:2529
+#: build/trans_presets.java:2730
+#: build/trans_presets.java:2747
+#: build/trans_presets.java:2762
+#: build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operador"
@@ -21429,5 +20354,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Sinal de Trânsito"
@@ -21437,5 +20362,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Tipo de cruzamento de pedestres"
@@ -21444,27 +20369,32 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "faixa de pedestre (sem sinal)"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "sinal de trânsito"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "ilha"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645
+#: build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "sem faixa"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646
+#: build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Travessia à cavalo"
@@ -21472,6 +20402,7 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647
+#: build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Travessia de bicicleta"
@@ -21480,11 +20411,12 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648
+#: build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Guarda de trânsito"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -21492,30 +20424,36 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelicano"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "toucan"
 msgstr "tucano"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "puffin"
 msgstr "papagaio"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pégasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649
+#: build/trans_presets.java:664
 msgid "tiger"
 msgstr "tigre"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Pare"
@@ -21523,5 +20461,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Faixa de Pedestres"
@@ -21530,14 +20468,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Editar Faixa de Pedestres"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21545,33 +20483,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21579,5 +20517,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21585,5 +20523,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Mini-rotatória"
@@ -21594,14 +20532,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Direção"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "sentido horário"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Retorno"
@@ -21611,5 +20549,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Limite da Cidade"
@@ -21617,15 +20555,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Editar Placa de Limite da Cidade"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Radar de Velocidade"
@@ -21634,5 +20572,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Telefone de Emergência"
@@ -21640,5 +20578,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Aclive"
@@ -21646,5 +20584,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Aclive Íngreme"
@@ -21652,5 +20590,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21660,10 +20598,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Travessia de Rio"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Editar Travessia de Rio"
@@ -21671,5 +20609,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Desfiladeiro"
@@ -21677,5 +20615,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Editar Desfiladeiro"
@@ -21687,7 +20625,10 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730
+#: build/trans_presets.java:1615
+#: build/trans_presets.java:1760
+#: build/trans_presets.java:2915
+#: build/trans_presets.java:2922
+#: build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Altitude"
@@ -21695,5 +20636,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Barreiras"
@@ -21701,5 +20642,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21707,5 +20648,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21750,16 +20691,22 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742
+#: build/trans_presets.java:761
+#: build/trans_presets.java:775
+#: build/trans_presets.java:797
+#: build/trans_presets.java:834
+#: build/trans_presets.java:847
+#: build/trans_presets.java:859
+#: build/trans_presets.java:871
+#: build/trans_presets.java:883
+#: build/trans_presets.java:895
+#: build/trans_presets.java:905
+#: build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21768,5 +20715,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21774,5 +20721,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21780,10 +20727,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21791,15 +20738,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21807,5 +20754,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21813,10 +20760,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21826,5 +20773,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21835,22 +20782,23 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812
+#: build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21858,5 +20806,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21865,5 +20813,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21875,10 +20823,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Entrada"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Editar Entrada"
@@ -21886,5 +20834,6 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842
+#: build/trans_presets.java:1570
 msgid "Gate"
 msgstr ""
@@ -21892,50 +20841,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21943,25 +20892,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21972,11 +20921,12 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934
+#: build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Água"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr ""
@@ -21984,5 +20934,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr ""
@@ -21990,5 +20940,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21996,10 +20946,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -22007,10 +20957,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr ""
@@ -22018,10 +20968,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr ""
@@ -22029,10 +20979,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr ""
@@ -22042,5 +20992,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr ""
@@ -22048,15 +20998,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Editar Água"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr ""
@@ -22064,15 +21014,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -22080,15 +21030,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -22096,5 +21046,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -22103,10 +21053,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -22117,14 +21067,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -22138,35 +21088,36 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032
+#: build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
 #: build/trans_presets.java:1039
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1041
-msgid "Mud"
-msgstr ""
-
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
 msgid "Beach"
 msgstr ""
@@ -22174,20 +21125,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr ""
@@ -22195,10 +21146,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Linha Costeira"
@@ -22206,5 +21157,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Editar Linha Costeira"
@@ -22212,5 +21163,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Rota de Barca"
@@ -22218,5 +21169,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Editar rota de barca"
@@ -22225,5 +21176,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -22231,10 +21182,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -22242,5 +21193,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -22248,5 +21199,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr ""
@@ -22254,15 +21205,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr ""
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Ponto de Hidrovia"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Portão de Dique"
@@ -22271,5 +21222,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Açude"
@@ -22277,20 +21228,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Editar Açude"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Queda d'água"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Editar Queda-d'água"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Ponto de Virada"
@@ -22299,15 +21250,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Editar Marina"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Embarcadouro"
@@ -22315,10 +21266,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Editar embarcadouro"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Terminal de Barca"
@@ -22326,10 +21277,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Editar Terminal de Barca"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Rampa de barco"
@@ -22339,20 +21290,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Editar Rampa de barco"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Transporte"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -22360,5 +21311,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -22388,86 +21339,14 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153
+#: build/trans_presets.java:1165
+#: build/trans_presets.java:1189
+#: build/trans_presets.java:1201
+#: build/trans_presets.java:1213
+#: build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22479,8 +21358,11 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
+#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
+#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22494,29 +21376,44 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
+#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
+#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
+#: build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
+#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
+#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
+#: build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154
+#: build/trans_presets.java:1166
+#: build/trans_presets.java:1178
+#: build/trans_presets.java:1190
+#: build/trans_presets.java:1202
+#: build/trans_presets.java:1214
+#: build/trans_presets.java:1226
+#: build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155
+#: build/trans_presets.java:1167
+#: build/trans_presets.java:1179
+#: build/trans_presets.java:1191
+#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Elitrificado"
@@ -22529,8 +21426,11 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155
+#: build/trans_presets.java:1167
+#: build/trans_presets.java:1179
+#: build/trans_presets.java:1191
+#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22601,12 +21501,20 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
-#: build/trans_style.java:1182 build/trans_style.java:1246
-#: build/trans_style.java:1254 build/trans_style.java:1263
-#: build/trans_style.java:1271 build/trans_style.java:1279
-#: build/trans_style.java:1280 build/trans_style.java:1287
+#: build/trans_presets.java:1155
+#: build/trans_presets.java:1167
+#: build/trans_presets.java:1179
+#: build/trans_presets.java:1191
+#: build/trans_presets.java:1203
+#: build/trans_presets.java:1215
+#: build/trans_presets.java:1227
+#: build/trans_style.java:756
+#: build/trans_style.java:1182
+#: build/trans_style.java:1246
+#: build/trans_style.java:1254
+#: build/trans_style.java:1263
+#: build/trans_style.java:1271
+#: build/trans_style.java:1279
+#: build/trans_style.java:1280
+#: build/trans_style.java:1287
 msgid "rail"
 msgstr "trilho"
@@ -22614,8 +21522,12 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156
+#: build/trans_presets.java:1168
+#: build/trans_presets.java:1180
+#: build/trans_presets.java:1192
+#: build/trans_presets.java:1204
+#: build/trans_presets.java:1216
+#: build/trans_presets.java:1228
+#: build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltagem"
@@ -22628,8 +21540,11 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157
+#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
+#: build/trans_presets.java:1193
+#: build/trans_presets.java:1205
+#: build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Frequencia (Hz)"
@@ -22642,23 +21557,26 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157
+#: build/trans_presets.java:1169
+#: build/trans_presets.java:1181
+#: build/trans_presets.java:1193
+#: build/trans_presets.java:1205
+#: build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Mono-trilho"
@@ -22666,50 +21584,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Editar Mono-trilho"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metrô"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Editar Metrô"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Bonde/VLT"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Editar Bonde/VLT"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22717,5 +21635,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22724,10 +21642,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22736,9 +21654,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22747,5 +21665,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22754,5 +21672,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22762,5 +21680,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22768,5 +21686,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22775,5 +21693,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22782,10 +21700,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22793,10 +21711,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22804,10 +21722,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22815,10 +21733,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gôndola"
@@ -22826,10 +21744,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22838,5 +21756,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22844,5 +21762,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22851,5 +21769,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22857,5 +21775,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Posto de Gasolina"
@@ -22865,62 +21783,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Editar Posto de Gasolina"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22978,32 +21896,59 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333
+#: build/trans_presets.java:1636
+#: build/trans_presets.java:1644
+#: build/trans_presets.java:1651
+#: build/trans_presets.java:1658
+#: build/trans_presets.java:1664
+#: build/trans_presets.java:1671
+#: build/trans_presets.java:1678
+#: build/trans_presets.java:1686
+#: build/trans_presets.java:1693
+#: build/trans_presets.java:1701
+#: build/trans_presets.java:1714
+#: build/trans_presets.java:1728
+#: build/trans_presets.java:1825
+#: build/trans_presets.java:1833
+#: build/trans_presets.java:1936
+#: build/trans_presets.java:1942
+#: build/trans_presets.java:2255
+#: build/trans_presets.java:2279
+#: build/trans_presets.java:2520
+#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
+#: build/trans_presets.java:2555
+#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
+#: build/trans_presets.java:2574
+#: build/trans_presets.java:2581
+#: build/trans_presets.java:2588
+#: build/trans_presets.java:2595
+#: build/trans_presets.java:2601
+#: build/trans_presets.java:2608
+#: build/trans_presets.java:2614
+#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
+#: build/trans_presets.java:2638
+#: build/trans_presets.java:2645
+#: build/trans_presets.java:2652
+#: build/trans_presets.java:2659
+#: build/trans_presets.java:2665
+#: build/trans_presets.java:2671
+#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
+#: build/trans_presets.java:2689
+#: build/trans_presets.java:2696
+#: build/trans_presets.java:2703
+#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
+#: build/trans_presets.java:2722
+#: build/trans_presets.java:2748
+#: build/trans_presets.java:2756
+#: build/trans_presets.java:2771
+#: build/trans_presets.java:2777
+#: build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Horário de Funcionamento"
@@ -23062,165 +22007,243 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333
+#: build/trans_presets.java:1636
+#: build/trans_presets.java:1644
+#: build/trans_presets.java:1651
+#: build/trans_presets.java:1658
+#: build/trans_presets.java:1664
+#: build/trans_presets.java:1671
+#: build/trans_presets.java:1678
+#: build/trans_presets.java:1693
+#: build/trans_presets.java:1701
+#: build/trans_presets.java:1714
+#: build/trans_presets.java:1728
+#: build/trans_presets.java:1825
+#: build/trans_presets.java:1833
+#: build/trans_presets.java:1936
+#: build/trans_presets.java:1942
+#: build/trans_presets.java:2255
+#: build/trans_presets.java:2279
+#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
+#: build/trans_presets.java:2555
+#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
+#: build/trans_presets.java:2574
+#: build/trans_presets.java:2581
+#: build/trans_presets.java:2588
+#: build/trans_presets.java:2595
+#: build/trans_presets.java:2601
+#: build/trans_presets.java:2608
+#: build/trans_presets.java:2614
+#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
+#: build/trans_presets.java:2638
+#: build/trans_presets.java:2645
+#: build/trans_presets.java:2652
+#: build/trans_presets.java:2659
+#: build/trans_presets.java:2665
+#: build/trans_presets.java:2671
+#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
+#: build/trans_presets.java:2689
+#: build/trans_presets.java:2696
+#: build/trans_presets.java:2703
+#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
+#: build/trans_presets.java:2722
+#: build/trans_presets.java:2748
+#: build/trans_presets.java:2756
+#: build/trans_presets.java:2771
+#: build/trans_presets.java:2777
+#: build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333
+#: build/trans_presets.java:1636
+#: build/trans_presets.java:1644
+#: build/trans_presets.java:1651
+#: build/trans_presets.java:1658
+#: build/trans_presets.java:1664
+#: build/trans_presets.java:1671
+#: build/trans_presets.java:1678
+#: build/trans_presets.java:1693
+#: build/trans_presets.java:1701
+#: build/trans_presets.java:1714
+#: build/trans_presets.java:1728
+#: build/trans_presets.java:1825
+#: build/trans_presets.java:1833
+#: build/trans_presets.java:1936
+#: build/trans_presets.java:1942
+#: build/trans_presets.java:2255
+#: build/trans_presets.java:2279
+#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
+#: build/trans_presets.java:2555
+#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
+#: build/trans_presets.java:2574
+#: build/trans_presets.java:2581
+#: build/trans_presets.java:2588
+#: build/trans_presets.java:2595
+#: build/trans_presets.java:2601
+#: build/trans_presets.java:2608
+#: build/trans_presets.java:2614
+#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
+#: build/trans_presets.java:2638
+#: build/trans_presets.java:2645
+#: build/trans_presets.java:2652
+#: build/trans_presets.java:2659
+#: build/trans_presets.java:2665
+#: build/trans_presets.java:2671
+#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
+#: build/trans_presets.java:2689
+#: build/trans_presets.java:2696
+#: build/trans_presets.java:2703
+#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
+#: build/trans_presets.java:2722
+#: build/trans_presets.java:2748
+#: build/trans_presets.java:2756
+#: build/trans_presets.java:2771
+#: build/trans_presets.java:2777
+#: build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Seg-Sex 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333
+#: build/trans_presets.java:1636
+#: build/trans_presets.java:1644
+#: build/trans_presets.java:1651
+#: build/trans_presets.java:1658
+#: build/trans_presets.java:1664
+#: build/trans_presets.java:1671
+#: build/trans_presets.java:1678
+#: build/trans_presets.java:1693
+#: build/trans_presets.java:1701
+#: build/trans_presets.java:1714
+#: build/trans_presets.java:1728
+#: build/trans_presets.java:1825
+#: build/trans_presets.java:1833
+#: build/trans_presets.java:1936
+#: build/trans_presets.java:1942
+#: build/trans_presets.java:2255
+#: build/trans_presets.java:2279
+#: build/trans_presets.java:2542
+#: build/trans_presets.java:2548
+#: build/trans_presets.java:2555
+#: build/trans_presets.java:2562
+#: build/trans_presets.java:2568
+#: build/trans_presets.java:2574
+#: build/trans_presets.java:2581
+#: build/trans_presets.java:2588
+#: build/trans_presets.java:2595
+#: build/trans_presets.java:2601
+#: build/trans_presets.java:2608
+#: build/trans_presets.java:2614
+#: build/trans_presets.java:2620
+#: build/trans_presets.java:2626
+#: build/trans_presets.java:2632
+#: build/trans_presets.java:2638
+#: build/trans_presets.java:2645
+#: build/trans_presets.java:2652
+#: build/trans_presets.java:2659
+#: build/trans_presets.java:2665
+#: build/trans_presets.java:2671
+#: build/trans_presets.java:2677
+#: build/trans_presets.java:2683
+#: build/trans_presets.java:2689
+#: build/trans_presets.java:2696
+#: build/trans_presets.java:2703
+#: build/trans_presets.java:2710
+#: build/trans_presets.java:2716
+#: build/trans_presets.java:2722
+#: build/trans_presets.java:2748
+#: build/trans_presets.java:2756
+#: build/trans_presets.java:2771
+#: build/trans_presets.java:2777
+#: build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ter-Dom 08:00-15:00; Sáb 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Tipos de combustíveis:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "Diesel"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "Biodísel"
 
 #. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
+#: build/trans_presets.java:1341
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
+#: build/trans_presets.java:1342
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
+#: build/trans_presets.java:1343
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -23237,5 +22260,6 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351
+#: build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23245,5 +22269,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Editar Estacionamento"
@@ -23254,25 +22278,28 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357
+#: build/trans_presets.java:1777
+#: build/trans_presets.java:1787
+#: build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Número de Referência"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358
+#: build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -23281,48 +22308,50 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360
+#: build/trans_presets.java:1778
+#: build/trans_presets.java:1788
+#: build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Taxa"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Vagas para Deficientes"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Vagas para Mulheres"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Vagas para Pais"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Lava Jato"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Editar Lava Jato"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Oficina"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Editar Oficina"
@@ -23330,5 +22359,6 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380
+#: build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Aluguel"
@@ -23337,10 +22367,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Editar Aluguel de Carros"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Compartilhamento"
@@ -23348,5 +22378,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Editar Compartilhamento de Carro"
@@ -23354,10 +22384,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Editar Bicicletário"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Capacidade"
@@ -23366,10 +22396,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Editar Aluguel de Bicicletas"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23379,5 +22409,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23385,5 +22415,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -23391,5 +22421,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -23397,5 +22427,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -23403,5 +22433,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Parada do Bonde/VLT"
@@ -23410,5 +22440,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Editar Parada do Bonde/VLT"
@@ -23416,5 +22446,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Plataforma de Trens"
@@ -23423,5 +22453,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Editar Plataforma de Trens"
@@ -23433,5 +22463,6 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449
+#: build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -23439,10 +22470,11 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451
+#: build/trans_presets.java:1496
 msgid "Area"
 msgstr "Área"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Entrada do Metrô"
@@ -23451,10 +22483,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Editar Entrada do Metrô"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461
+#: build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Cadeira de Rodas"
@@ -23463,5 +22496,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Terminal de Ônibus"
@@ -23470,5 +22503,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Editar Terminal de Ônibus"
@@ -23476,5 +22509,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Ponto de Ônibus"
@@ -23484,5 +22517,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Editar Ponto de Ônibus"
@@ -23491,6 +22524,7 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484
+#: build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Abrigo"
@@ -23498,19 +22532,20 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485
+#: build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Banco"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Piso táctil"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Plataforma de Ônibus"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Editar Plataforma de Ônibus"
@@ -23518,5 +22553,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Táxi"
@@ -23524,5 +22559,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Editar Ponto de Táxi"
@@ -23530,10 +22565,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Aeroporto"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23541,5 +22576,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23547,10 +22582,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23559,5 +22594,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23565,5 +22600,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23571,5 +22606,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23577,5 +22612,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23583,5 +22618,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23589,5 +22624,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23597,5 +22632,6 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543
+#: build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23605,5 +22641,6 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548
+#: build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Hangar"
@@ -23614,6 +22651,7 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553
+#: build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23623,5 +22661,6 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558
+#: build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23630,5 +22669,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Terminal"
@@ -23636,5 +22675,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Editar Terminal"
@@ -23642,15 +22681,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Viagem"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Acomodação"
@@ -23662,5 +22701,6 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580
+#: build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23669,15 +22709,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Editar Hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23685,20 +22725,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Editar Motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chalé"
@@ -23706,10 +22746,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Editar Chalé"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Albergue"
@@ -23717,30 +22757,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Editar Albergue"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Local de Camping"
@@ -23748,10 +22788,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Editar Local de Camping"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Comida e Bebida"
@@ -23762,5 +22802,6 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630
+#: build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurante"
@@ -23768,5 +22809,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Editar Restaurante"
@@ -23774,5 +22815,6 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Cozinha"
@@ -23780,73 +22822,90 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "italian"
 msgstr "italiana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "chinese"
 msgstr "chinessa"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "burger"
 msgstr "hambúrguer"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "greek"
 msgstr "grega"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "german"
 msgstr "alemã"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "indian"
 msgstr "indiana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "regional"
 msgstr "regional"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turca"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiática"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "thai"
 msgstr "tailandesa"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexicana"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japonesa"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635
+#: build/trans_presets.java:1643
 msgid "sushi"
 msgstr "sushi"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Lanchonete"
@@ -23854,17 +22913,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Editar Lanchonete Fast-Food"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Café"
@@ -23872,9 +22931,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Editar Café"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Bar/Pub"
@@ -23882,18 +22941,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Editar Bar/Pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar"
@@ -23901,9 +22960,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Editar Bar"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Boate"
@@ -23911,24 +22970,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Editar Boate"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turismo"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Atração"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Editar Atração Turística"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museu"
@@ -23936,9 +22995,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Editar Museu"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoológico"
@@ -23947,9 +23006,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Editar Zoológico"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Mirante"
@@ -23957,24 +23016,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Editar Mirante"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Parque Temático"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Editar Parque Temático"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Arte"
@@ -23982,5 +23041,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Editar Arte"
@@ -23988,19 +23047,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Centro de Informações Turísticas"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -24038,34 +23097,37 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
-#: build/trans_style.java:641 build/trans_style.java:657
+#: build/trans_presets.java:1735
+#: build/trans_style.java:625
+#: build/trans_style.java:641
+#: build/trans_style.java:657
 #: build/trans_style.java:665
 msgid "street"
 msgstr "estrada"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "esquema"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "cidade"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "região"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737
+#: build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -24075,5 +23137,6 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739
+#: build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -24081,5 +23144,6 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740
+#: build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -24087,6 +23151,7 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741
+#: build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Ciclismo"
@@ -24094,5 +23159,6 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742
+#: build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Mountain bike"
@@ -24100,6 +23166,7 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743
+#: build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Esqui"
@@ -24107,5 +23174,6 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744
+#: build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -24113,46 +23181,47 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745
+#: build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... outros modos de transporte possíveis"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Quadro de Informações"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "natureza"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "vida selvagem"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -24160,29 +23229,30 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775
+#: build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Outros Pontos de Informação"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Editar Abrigo"
@@ -24190,25 +23260,26 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804
+#: build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Lareira"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Campo de Picnic"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Editar Campo de Picnic"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Lugares Históricos"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Castelo"
@@ -24217,19 +23288,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Editar Castelo"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruínas"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Editar Ruínas"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Sítio Arqueológico"
@@ -24238,9 +23309,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Editar Sítio Arqueológico"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Campo de Batalha"
@@ -24248,10 +23319,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Editar Campo de Batalha"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -24259,5 +23330,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -24265,15 +23336,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monumento"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Editar Monumento"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Memorial"
@@ -24281,55 +23352,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Editar Memorial"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Editar Cruz de beira de estrada"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Lazer"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Parque Aquático"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Editar Parque Aquático"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Parquinho"
@@ -24337,35 +23408,36 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Editar Parquinho"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Pescaria"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Editar Pescaria"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894
+#: build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Esportes"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Estádio"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Editar Estádio"
@@ -24379,6 +23451,8 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901
+#: build/trans_presets.java:1910
+#: build/trans_presets.java:1919
+#: build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "selecionar esporte:"
@@ -24770,29 +23844,54 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
-#: build/trans_style.java:3705 build/trans_style.java:3713
-#: build/trans_style.java:3721 build/trans_style.java:3729
-#: build/trans_style.java:3737 build/trans_style.java:3745
-#: build/trans_style.java:3753 build/trans_style.java:3761
-#: build/trans_style.java:3769 build/trans_style.java:3777
-#: build/trans_style.java:3785 build/trans_style.java:3793
-#: build/trans_style.java:3801 build/trans_style.java:3809
-#: build/trans_style.java:3817 build/trans_style.java:3825
-#: build/trans_style.java:3833 build/trans_style.java:3841
-#: build/trans_style.java:3849 build/trans_style.java:3857
-#: build/trans_style.java:3865 build/trans_style.java:3873
-#: build/trans_style.java:3881 build/trans_style.java:3889
-#: build/trans_style.java:3897 build/trans_style.java:3905
-#: build/trans_style.java:3913 build/trans_style.java:3921
-#: build/trans_style.java:3929 build/trans_style.java:3937
-#: build/trans_style.java:3945 build/trans_style.java:3953
-#: build/trans_style.java:3961 build/trans_style.java:3969
-#: build/trans_style.java:3977 build/trans_style.java:3985
-#: build/trans_style.java:3993 build/trans_style.java:4001
-#: build/trans_style.java:4009 build/trans_style.java:4017
-#: build/trans_style.java:4025 build/trans_style.java:4033
-#: build/trans_style.java:4041 build/trans_style.java:4049
-#: build/trans_style.java:4057 build/trans_style.java:4065
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
+#: build/trans_style.java:3705
+#: build/trans_style.java:3713
+#: build/trans_style.java:3721
+#: build/trans_style.java:3729
+#: build/trans_style.java:3737
+#: build/trans_style.java:3745
+#: build/trans_style.java:3753
+#: build/trans_style.java:3761
+#: build/trans_style.java:3769
+#: build/trans_style.java:3777
+#: build/trans_style.java:3785
+#: build/trans_style.java:3793
+#: build/trans_style.java:3801
+#: build/trans_style.java:3809
+#: build/trans_style.java:3817
+#: build/trans_style.java:3825
+#: build/trans_style.java:3833
+#: build/trans_style.java:3841
+#: build/trans_style.java:3849
+#: build/trans_style.java:3857
+#: build/trans_style.java:3865
+#: build/trans_style.java:3873
+#: build/trans_style.java:3881
+#: build/trans_style.java:3889
+#: build/trans_style.java:3897
+#: build/trans_style.java:3905
+#: build/trans_style.java:3913
+#: build/trans_style.java:3921
+#: build/trans_style.java:3929
+#: build/trans_style.java:3937
+#: build/trans_style.java:3945
+#: build/trans_style.java:3953
+#: build/trans_style.java:3961
+#: build/trans_style.java:3969
+#: build/trans_style.java:3977
+#: build/trans_style.java:3985
+#: build/trans_style.java:3993
+#: build/trans_style.java:4001
+#: build/trans_style.java:4009
+#: build/trans_style.java:4017
+#: build/trans_style.java:4025
+#: build/trans_style.java:4033
+#: build/trans_style.java:4041
+#: build/trans_style.java:4049
+#: build/trans_style.java:4057
+#: build/trans_style.java:4065
 #: build/trans_style.java:4073
 msgid "sport"
@@ -24803,225 +23902,291 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "archery"
 msgstr "arco e flecha"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "futebol australiano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basquete"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "bowls"
 msgstr "boliche"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "canoe"
 msgstr "canoagem"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "climbing"
 msgstr "escalada"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "cricket"
 msgstr "críquete"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "cycling"
 msgstr "ciclismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "corrida de cachorros"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "football"
 msgstr "futebol americano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "golf"
 msgstr "golfe"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "ginástica olímpica"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hóquei"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "corrida de cavalos"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "motor"
 msgstr "automobilismo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "shooting"
 msgstr "tiro"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "skiing"
 msgstr "esqui"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futebol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "swimming"
 msgstr "natação"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "ping-pong"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903
+#: build/trans_presets.java:1912
+#: build/trans_presets.java:1921
+#: build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tênis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Centro de Esportes"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Editar Centro de Esportes"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr ""
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini-Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Editar Mini-Golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr ""
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -25060,21 +24225,38 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950
+#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
+#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
+#: build/trans_presets.java:2043
+#: build/trans_presets.java:2050
+#: build/trans_presets.java:2058
+#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "type"
 msgstr "tipo"
@@ -25113,203 +24295,271 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950
+#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
+#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
+#: build/trans_presets.java:2043
+#: build/trans_presets.java:2050
+#: build/trans_presets.java:2058
+#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950
+#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
+#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
+#: build/trans_presets.java:2043
+#: build/trans_presets.java:2050
+#: build/trans_presets.java:2058
+#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950
+#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
+#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
+#: build/trans_presets.java:2043
+#: build/trans_presets.java:2050
+#: build/trans_presets.java:2058
+#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "stadium"
 msgstr "estádio"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950
+#: build/trans_presets.java:1956
+#: build/trans_presets.java:1962
+#: build/trans_presets.java:1968
+#: build/trans_presets.java:1974
+#: build/trans_presets.java:1980
+#: build/trans_presets.java:1986
+#: build/trans_presets.java:1992
+#: build/trans_presets.java:1998
+#: build/trans_presets.java:2004
+#: build/trans_presets.java:2010
+#: build/trans_presets.java:2016
+#: build/trans_presets.java:2022
+#: build/trans_presets.java:2028
+#: build/trans_presets.java:2034
+#: build/trans_presets.java:2043
+#: build/trans_presets.java:2050
+#: build/trans_presets.java:2058
+#: build/trans_presets.java:2064
+#: build/trans_presets.java:2070
+#: build/trans_presets.java:2076
+#: build/trans_presets.java:2082
+#: build/trans_presets.java:2088
+#: build/trans_presets.java:2094
+#: build/trans_presets.java:2100
+#: build/trans_presets.java:2106
+#: build/trans_presets.java:2112
+#: build/trans_presets.java:2118
+#: build/trans_presets.java:2124
+#: build/trans_presets.java:2130
+#: build/trans_presets.java:2136
+#: build/trans_presets.java:2142
+#: build/trans_presets.java:2148
+#: build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
+msgid "Edit Athletics"
+msgstr ""
+
+#: build/trans_presets.java:1964
+msgid "Archery"
+msgstr ""
+
+#. item "Sport/Archery"
 #: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
-msgid "Edit Athletics"
-msgstr ""
-
+msgid "Edit Archery"
+msgstr ""
+
+#: build/trans_presets.java:1970
+msgid "Climbing"
+msgstr ""
+
+#. item "Sport/Climbing"
 #: build/trans_presets.java:1971
-msgid "Archery"
-msgstr ""
-
-#. item "Sport/Archery"
-#: build/trans_presets.java:1972
-msgid "Edit Archery"
-msgstr ""
-
+msgid "Edit Climbing"
+msgstr ""
+
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
 #: build/trans_presets.java:1977
-msgid "Climbing"
-msgstr ""
-
-#. item "Sport/Climbing"
-#: build/trans_presets.java:1978
-msgid "Edit Climbing"
-msgstr ""
-
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr ""
+
+#. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
-msgid "Dog Racing"
-msgstr ""
-
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
-msgid "Edit Dog Racing"
-msgstr ""
-
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
-msgid "Equestrian"
-msgstr ""
-
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
-msgid "Edit Equestrian"
-msgstr ""
-
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
-msgid "Edit Gymnastics"
-msgstr ""
-
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
 #: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
-msgid "Edit Motor Sports"
-msgstr ""
-
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
+msgid "Edit Skateboard"
+msgstr ""
+
+#: build/trans_presets.java:2030
+msgid "Swimming"
+msgstr ""
+
+#. item "Sport/Swimming"
 #: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
-msgid "Edit Skateboard"
-msgstr ""
-
-#: build/trans_presets.java:2037
-msgid "Swimming"
-msgstr ""
-
-#. item "Sport/Swimming"
-#: build/trans_presets.java:2038
 msgid "Edit Swimming"
 msgstr ""
@@ -25317,52 +24567,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr ""
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Dificuldade"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr ""
@@ -25370,177 +24620,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2047
+msgid "Edit Shooting"
+msgstr ""
+
+#: build/trans_presets.java:2053
+msgid "Sport (Ball)"
+msgstr ""
+
+#. group "Sport (Ball)"
 #: build/trans_presets.java:2054
-msgid "Edit Shooting"
+msgid "Soccer"
+msgstr ""
+
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2055
+msgid "Edit Soccer"
 msgstr ""
 
 #: build/trans_presets.java:2060
-msgid "Sport (Ball)"
-msgstr ""
-
-#. group "Sport (Ball)"
+msgid "Football"
+msgstr ""
+
+#. item "Sport (Ball)/Football"
 #: build/trans_presets.java:2061
-msgid "Soccer"
-msgstr ""
-
-#. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
-msgid "Edit Soccer"
-msgstr ""
-
-#: build/trans_presets.java:2067
-msgid "Football"
-msgstr ""
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
 msgid "Edit Football"
 msgstr "Editar Futebol Americano"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Futebol Australiano"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Editar Futebol Australiano"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Editar Campo de Baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basquetebol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Editar Basquetebol"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Editar Golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr ""
 
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2091
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
-#: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Críquete"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Editar Críquete"
 
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
+#: build/trans_presets.java:2109
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Editar Hockey"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
-#: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Editar Rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Tênis de mesa"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Editar Tênis de Mesa"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Editar Tênis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Construção humana"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Edificação"
@@ -25548,5 +24798,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Prédio Público"
@@ -25554,10 +24804,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Editar Prédio Público"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Prefeitura"
@@ -25565,10 +24815,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Editar Prefeitura"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Embaixada"
@@ -25576,10 +24826,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Editar Embaixada"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Fórum"
@@ -25588,10 +24838,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Editar Fórum"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Presídio"
@@ -25600,10 +24850,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Editar Presídio"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polícia"
@@ -25613,10 +24863,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Editar Polícia"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Bombeiros"
@@ -25625,10 +24875,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Editar Bombeiros"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Correios"
@@ -25636,5 +24886,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Editar Correios"
@@ -25642,15 +24892,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Creche"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Editar Creche"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Escola"
@@ -25658,10 +24908,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Editar Escola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universidade"
@@ -25669,10 +24919,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Editar Universidade"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Faculdade"
@@ -25680,5 +24930,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Editar Faculdade"
@@ -25686,5 +24936,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Cinema"
@@ -25693,10 +24943,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Editar Cinema"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Biblioteca"
@@ -25705,9 +24955,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Editar Biblioteca"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Centro de Artes"
@@ -25715,10 +24965,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Editar Centro de Artes"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teatro"
@@ -25727,10 +24977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Editar Teatro"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Lugar de Adoração"
@@ -25740,5 +24990,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Editar Lugar de Adoração"
@@ -25747,6 +24997,7 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religião"
@@ -25755,66 +25006,79 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "cristianismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduísmo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jainismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judaísmo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "muçulmano"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikhismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "espiritismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoísmo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitarianismo"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277
+#: build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrianismo"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Denominação"
@@ -25823,81 +25087,96 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglicana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "batista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "católica"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangélica"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "testemunha de jeová"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luterana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodista"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mórmon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbiteriana"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestante"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "xiismo"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278
+#: build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunismo"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Endereços"
@@ -25906,5 +25185,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Editar Informações de Endereço"
@@ -25912,5 +25191,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Número da casa"
@@ -25918,25 +25197,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Nome da casa"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Nome do rua"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Cidade"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "CEP"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Código do país"
@@ -25945,5 +25224,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Editar Interpolação de Endereços"
@@ -25951,61 +25230,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Esquema de numeração"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "números ímpares"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "números pares"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "alfabético"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Construção humana"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fábrica"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Editar Fábrica"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torre"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Editar Torre"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "comunicação"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "observação"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Altura (metros)"
@@ -26013,25 +25292,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Torre de Água"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Editar Torre de Água"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasômetro"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Editar Gasômetro"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Farol"
@@ -26039,10 +25318,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Editar Farol"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Moinho de Vento"
@@ -26050,10 +25329,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Editar Moinho de Vento"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Cano"
@@ -26062,41 +25341,42 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Editar Cano"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348
+#: build/trans_presets.java:2391
 msgid "gas"
 msgstr "gás"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "calor"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "petróleo"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "qualquer substância"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Localidade"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "subaquático"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Estação de Tratamento de Esgoto"
@@ -26106,10 +25386,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Editar Estação de Tratamento de Esgoto"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Guindaste"
@@ -26117,5 +25397,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Editar Guindaste"
@@ -26123,10 +25403,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Vértice Geodésico"
@@ -26134,10 +25414,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Editar Vértice Geodésico"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Câmera de Vigilância"
@@ -26145,23 +25425,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Editar Câmera de Vigilância"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "público"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Gerador de Energia"
@@ -26171,35 +25451,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Editar Gerador de Energia"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "eólica"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hidrelétrica"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fóssil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nuclear"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "carvão"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "carvão"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Estação de Energia"
@@ -26208,10 +25488,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Editar Estação de Energia"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Subestação de Energia"
@@ -26220,5 +25500,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Editar Subestação de Energia"
@@ -26226,10 +25506,11 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409
+#: build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Torre de Energia"
@@ -26240,23 +25521,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Editar Torre de Energia"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "torre"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "polo"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Linha de transmissão"
@@ -26265,74 +25546,75 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Editar Linha de Transmissão"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Tipo de Linha de Transmissão"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "linha de transmissão"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Quantidade de Cabos"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Número de cabos (ou condutores) por cabo-de-força"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "simples"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "duplo"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "triplo"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "quádruplo"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Comodidades"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Banheiros"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "limitado"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442
+#: build/trans_presets.java:2732
 msgid "Note"
 msgstr "Nota"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Caixa de Correio"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefone"
@@ -26341,5 +25623,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Editar Telefone"
@@ -26347,5 +25629,6 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455
+#: build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Moedas"
@@ -26353,5 +25636,6 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456
+#: build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Notas"
@@ -26359,5 +25643,6 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457
+#: build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Carteiras Eletrónicas ou Cartões pré-pagos"
@@ -26365,5 +25650,6 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458
+#: build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Cartões de Débito"
@@ -26371,15 +25657,16 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459
+#: build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Cartão de Crédito"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Cartão Telefônico"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Reciclagem"
@@ -26388,5 +25675,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Editar Centro de Reciclagem"
@@ -26394,35 +25681,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Baterias"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Latas"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Roupas"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Vidro"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papel"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Ferro Velho"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Cesta de Lixo"
@@ -26430,5 +25717,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Editar Cesta de Lixo"
@@ -26437,31 +25724,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "rocha"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plástico"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Cor"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "preto"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "marrom"
@@ -26540,39 +25827,44 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
-#: build/trans_style.java:3165 build/trans_style.java:3173
-#: build/trans_style.java:3181 build/trans_style.java:3189
-#: build/trans_style.java:3236 build/trans_style.java:3244
-#: build/trans_style.java:3342 build/trans_style.java:3350
+#: build/trans_presets.java:2484
+#: build/trans_style.java:3157
+#: build/trans_style.java:3165
+#: build/trans_style.java:3173
+#: build/trans_style.java:3181
+#: build/trans_style.java:3189
+#: build/trans_style.java:3236
+#: build/trans_style.java:3244
+#: build/trans_style.java:3342
+#: build/trans_style.java:3350
 msgid "green"
 msgstr "verde"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "vermelho"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "azul"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "cinza"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "branco"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Número de Assentos"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26581,30 +25873,31 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490
+#: build/trans_presets.java:2972
 msgid "Height"
 msgstr "Altura"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "baixa"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "metade"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "cheio"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Ocutar"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Bloquear"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Chafariz"
@@ -26613,10 +25906,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Editar Chafariz"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Bebedouro"
@@ -26625,10 +25918,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Editar Bebedouro"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Hidrante"
@@ -26637,5 +25930,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Editar Hidrante"
@@ -26643,5 +25936,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Berçário"
@@ -26649,15 +25942,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Editar Berçário"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Lojas"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Concessionária"
@@ -26665,10 +25958,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Editar Loja de Carros"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Casa de Bicicleta"
@@ -26677,28 +25970,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Editar Loja de Bicicletas"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermercado"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Editar Supermercado"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Loja de Conveniência"
@@ -26706,9 +25999,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Editar Loja de Conveniência"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Quiosque"
@@ -26716,27 +26009,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Editar Quiosque"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Livraria"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Editar Livraria"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Agência de Viagem"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Editar Agência de Viagem"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Açougue"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Editar Açougue"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Padaria"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Editar Padaria"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Floricultura"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Editar Floricultura"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Orgânicos"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Editar Loja de Orgânicos"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Álcool"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Editar"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Bebidas"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Editar Loja de Bebidas"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Computador"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Editar Loja de Computador"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Eletrônicos"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Editar Loja de Eletrônicos"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Equipamentos de Áudio"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Editar Loja de Equipamentos de Áudio"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Móveis"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Editar Loja de Móveis"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Loja de Plantas"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Editar Loja de Plantas"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Componente físico"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Editar Loja de Utilidades Domésticas"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Loja de Ferragens"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Editar Loja de Ferragens"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Papelaria"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Editar Papelaria"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Cabelereiro"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Editar Cabelereiro"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Sapatos"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Editar Loja de Sapatos"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Brinquedos"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Editar Loja de Brinquedos"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Locadora de Vídeo"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Editar Locadora de Vídeo"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Lavanderia à Seco"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Editar Lavanderia à Seco"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Lavanderia"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Editar Lavanderia"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Outdoor"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Editar Loja de Esportes"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Óculos"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Editar Loja de Óculos"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr ""
@@ -26744,5 +26251,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Editar Máquina de Vendas"
@@ -26750,306 +26257,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Produtos à venda"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "tíquetes de transporte público"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "mapas de transporte público"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "tíquetes de estacionamento"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "comida"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "bebidas"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "doces"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarros"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "ração animal"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "jornais"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "brinquedos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "selos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "Cartões SIM"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "vales"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicicleta"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "preservativos"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "absorventes"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "sacos para fezes"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Cartões de fidelidade"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Açougue"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Editar Açougue"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Padaria"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Editar Padaria"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Floricultura"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Editar Floricultura"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Orgânicos"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Editar Loja de Orgânicos"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Álcool"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Editar"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Bebidas"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Editar Loja de Bebidas"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Computador"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Editar Loja de Computador"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Eletrônicos"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Editar Loja de Eletrônicos"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Equipamentos de Áudio"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Editar Loja de Equipamentos de Áudio"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Móveis"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Editar Loja de Móveis"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Loja de Plantas"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Editar Loja de Plantas"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Componente físico"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Editar Loja de Utilidades Domésticas"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Loja de Ferragens"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Editar Loja de Ferragens"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Papelaria"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Editar Papelaria"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Cabelereiro"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Editar Cabelereiro"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Sapatos"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Editar Loja de Sapatos"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Brinquedos"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Editar Loja de Brinquedos"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Locadora de Vídeo"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Editar Locadora de Vídeo"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Lavanderia à Seco"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Editar Lavanderia à Seco"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Lavanderia"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Editar Lavanderia"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Outdoor"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Editar Loja de Esportes"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Óculos"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Editar Loja de Óculos"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Dinheiro"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banco"
@@ -27057,14 +26356,15 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Editar Banco"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749
+#: build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Caixa Eletrônico"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Loja de Câmbio"
@@ -27072,5 +26372,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Editar Loja de Câmbio"
@@ -27078,15 +26378,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Editar Caixa Eletrônico"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Saúde"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Médicos"
@@ -27094,18 +26394,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Editar Médicos"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dentistas"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Editar Dentistas"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Farmácia"
@@ -27113,5 +26413,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Editar Farmácia"
@@ -27119,9 +26419,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hospital"
@@ -27129,10 +26429,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Editar Hospital"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Entrada de Emergência"
@@ -27141,5 +26441,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Editar Entrada de Emergência"
@@ -27148,20 +26448,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Número do Ponto"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Número de telefone"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Use código internacional, como +12-345-67890)"
@@ -27169,5 +26469,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinária"
@@ -27176,64 +26476,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Editar Veterinária"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografia"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Lugares"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Continente"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Editar Continente"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "País"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Editar País"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Estado"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Editar Estado"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Região"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Editar Região"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Condado"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Editar Condado"
@@ -27241,15 +26541,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Cidade"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Editar Cidade (mais que 100 mil habitantes)"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Cidade (menos que 100 mil habitantes)"
@@ -27257,10 +26557,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Editar Cidade (menos que 100 mil habitantes)"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Bairro"
@@ -27268,25 +26568,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Editar Bairro"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Vilarejo"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Editar Vilarejo"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr ""
@@ -27294,5 +26594,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Localidade"
@@ -27300,10 +26600,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Editar Localidade"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ilha"
@@ -27311,10 +26611,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Editar Ilha"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Ilhota"
@@ -27322,5 +26622,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Editar Ilhota"
@@ -27328,5 +26628,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Entrada de Caverna"
@@ -27334,10 +26634,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Editar Entrada de Caverna"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Pico"
@@ -27345,10 +26645,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Editar Pico"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Geleira"
@@ -27356,10 +26656,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Editar Geleira"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulcão"
@@ -27367,70 +26667,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Editar Vulcão"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Fronteiras"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nacional"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Editar Fronteiras Nacionais"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrativo"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Editar Fronteiras Administrativas"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Editar Fronteiras Civis"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Político"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Editar Fronteiras Políticas"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Parque nacional"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Editar Fronteira de Parque Nacional"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Uso da terra"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Árvore"
@@ -27439,15 +26739,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Editar Árvore"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Nome Botânico"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Floresta"
@@ -27456,5 +26756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Editar Floresta"
@@ -27462,17 +26762,20 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981
+#: build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "conífera"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981
+#: build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "decídua"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981
+#: build/trans_presets.java:2990
 msgid "mixed"
 msgstr "misturado"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Floresta"
@@ -27481,14 +26784,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Editar zona Florestal"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Reserva Natural"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Editar Reserva Natural"
@@ -27496,25 +26799,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Arbusto"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Editar arbusto"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -27522,10 +26825,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Editar rocha"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Matagal"
@@ -27533,5 +26836,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Editar matagal"
@@ -27539,5 +26842,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Fazenda"
@@ -27546,45 +26849,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Terra agrícola"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Editar zona Agrícola"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vinhedo"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Editar zona de Vinhedos"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Hortas comunitárias"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27592,25 +26895,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Jardim"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Editar Jardim"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Grama"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Editar zona de Gramado"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27618,10 +26921,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Comum"
@@ -27629,20 +26932,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Parque"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Editar Parque"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "área de recreação"
@@ -27650,5 +26953,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27656,15 +26959,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Área residencial"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Editar zona Residencial"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Cemitério"
@@ -27672,9 +26975,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Editar Cemitério"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cemitério"
@@ -27682,39 +26985,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Editar zona de Cemitério"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Comércio"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Comercial"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Editar zona Comercial"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industrial"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Editar zona Industrial"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27722,15 +27025,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militar"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Editar zona Militar"
@@ -27738,50 +27041,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Área de construção"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Editar zona para Construção"
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Aterro"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Editar Aterro"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Pedreira"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27791,5 +27094,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Editar Multipolígono"
@@ -27798,10 +27101,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "segmento externo"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "segmento interno"
@@ -27809,5 +27112,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Restrição de manobra"
@@ -27816,5 +27119,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Editar restrição de manobras"
@@ -27822,34 +27125,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Restrição"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "proibida_conversão_esquerda"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "proibida_conversão_direita"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "proibido_em_frente"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "proibido_retornar"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "somente_a_direita"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "somente_a_esquerda"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "somente_em_frente"
@@ -27858,15 +27161,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "do caminho"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "nó de via ou caminho"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "para caminho"
@@ -27874,5 +27177,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Rota"
@@ -27881,5 +27184,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Editar Rota"
@@ -27887,5 +27190,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Tipo de rota"
@@ -27976,25 +27279,30 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
-#: build/trans_style.java:689 build/trans_style.java:715
-#: build/trans_style.java:732 build/trans_style.java:909
-#: build/trans_style.java:917 build/trans_style.java:925
-#: build/trans_style.java:933 build/trans_style.java:941
+#: build/trans_presets.java:3214
+#: build/trans_style.java:233
+#: build/trans_style.java:689
+#: build/trans_style.java:715
+#: build/trans_style.java:732
+#: build/trans_style.java:909
+#: build/trans_style.java:917
+#: build/trans_style.java:925
+#: build/trans_style.java:933
+#: build/trans_style.java:941
 msgid "bicycle"
 msgstr "bicicleta"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "ônibus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "estrada"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "barca"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "Esqui"
@@ -28054,16 +27362,20 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
-#: build/trans_style.java:697 build/trans_style.java:705
-#: build/trans_style.java:723 build/trans_style.java:739
-#: build/trans_style.java:740 build/trans_style.java:748
+#: build/trans_presets.java:3214
+#: build/trans_style.java:247
+#: build/trans_style.java:697
+#: build/trans_style.java:705
+#: build/trans_style.java:723
+#: build/trans_style.java:739
+#: build/trans_style.java:740
+#: build/trans_style.java:748
 msgid "foot"
 msgstr "a pé"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "bonde/VLT"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "desvio"
@@ -28077,10 +27389,11 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214
+#: build/trans_style.java:1208
 msgid "subway"
 msgstr "Metrô"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Descrição de símbolo"
@@ -28088,31 +27401,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Rede"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "Proposto"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "alternativa"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "temporário"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "conexão"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Cor (hex)"
@@ -28121,32 +27434,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "segmento de rota"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "segmento em frente"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "Ponto de parada"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "ponto de parada em frente"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "ponto de parada atrás"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr ""
 
 #. mappaint style named "standard"
@@ -28238,6 +27626,8 @@
 #. <rule>
 #. <condition k="tunnel" b="yes"/>
-#: build/trans_style.java:132 build/trans_style.java:146
-#: build/trans_style.java:153 build/trans_style.java:160
+#: build/trans_style.java:132
+#: build/trans_style.java:146
+#: build/trans_style.java:153
+#: build/trans_style.java:160
 #: build/trans_style.java:167
 msgid "bridge"
@@ -28294,7 +27684,10 @@
 #. <rule>
 #. <condition k="mountain_pass" b="yes"/>
-#: build/trans_style.java:139 build/trans_style.java:174
-#: build/trans_style.java:181 build/trans_style.java:188
-#: build/trans_style.java:633 build/trans_style.java:4087
+#: 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:4087
 msgid "deprecated"
 msgstr "depreciado"
@@ -28336,5 +27729,6 @@
 #. <rule>
 #. <condition k="highway" v="bridleway"/>
-#: build/trans_style.java:275 build/trans_style.java:681
+#: build/trans_style.java:275
+#: build/trans_style.java:681
 msgid "horse"
 msgstr "cavalo"
@@ -28556,11 +27950,18 @@
 #. <icon annotate="true" src="misc/no_icon.png"/>
 #. color barrier
-#: build/trans_style.java:388 build/trans_style.java:401
-#: build/trans_style.java:402 build/trans_style.java:421
-#: build/trans_style.java:422 build/trans_style.java:441
-#: build/trans_style.java:442 build/trans_style.java:449
-#: build/trans_style.java:462 build/trans_style.java:463
-#: build/trans_style.java:476 build/trans_style.java:477
-#: build/trans_style.java:490 build/trans_style.java:491
+#: build/trans_style.java:388
+#: build/trans_style.java:401
+#: build/trans_style.java:402
+#: build/trans_style.java:421
+#: build/trans_style.java:422
+#: build/trans_style.java:441
+#: build/trans_style.java:442
+#: build/trans_style.java:449
+#: build/trans_style.java:462
+#: build/trans_style.java:463
+#: build/trans_style.java:476
+#: build/trans_style.java:477
+#: build/trans_style.java:490
+#: build/trans_style.java:491
 msgid "barrier"
 msgstr "obstáculo"
@@ -28677,7 +28078,10 @@
 #. <rule>
 #. <condition k="tracktype" v="grade5"/>
-#: build/trans_style.java:649 build/trans_style.java:951
-#: build/trans_style.java:959 build/trans_style.java:967
-#: build/trans_style.java:975 build/trans_style.java:983
+#: build/trans_style.java:649
+#: build/trans_style.java:951
+#: build/trans_style.java:959
+#: build/trans_style.java:967
+#: build/trans_style.java:975
+#: build/trans_style.java:983
 msgid "highway_track"
 msgstr "trilha_autoestrada"
@@ -28826,5 +28230,6 @@
 #. <condition k="waterway" v="riverbank"/>
 #. color riverbank
-#: build/trans_style.java:1001 build/trans_style.java:1002
+#: build/trans_style.java:1001
+#: build/trans_style.java:1002
 msgid "riverbank"
 msgstr "margem de rio"
@@ -29045,13 +28450,22 @@
 #. <condition k="man_made" v="water_works"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_style.java:1064 build/trans_style.java:1093
-#: build/trans_style.java:1109 build/trans_style.java:1110
-#: build/trans_style.java:1118 build/trans_style.java:1603
-#: build/trans_style.java:1610 build/trans_style.java:1619
-#: build/trans_style.java:1627 build/trans_style.java:1659
-#: build/trans_style.java:1667 build/trans_style.java:1675
-#: build/trans_style.java:1683 build/trans_style.java:1690
-#: build/trans_style.java:1699 build/trans_style.java:1707
-#: build/trans_style.java:1715 build/trans_style.java:1723
+#: build/trans_style.java:1064
+#: build/trans_style.java:1093
+#: build/trans_style.java:1109
+#: build/trans_style.java:1110
+#: build/trans_style.java:1118
+#: build/trans_style.java:1603
+#: build/trans_style.java:1610
+#: build/trans_style.java:1619
+#: build/trans_style.java:1627
+#: build/trans_style.java:1659
+#: build/trans_style.java:1667
+#: build/trans_style.java:1675
+#: build/trans_style.java:1683
+#: build/trans_style.java:1690
+#: build/trans_style.java:1699
+#: build/trans_style.java:1707
+#: build/trans_style.java:1715
+#: build/trans_style.java:1723
 #: build/trans_style.java:1731
 msgid "manmade"
@@ -29126,6 +28540,8 @@
 #. <rule>
 #. <condition k="railway" v="level_crossing"/>
-#: build/trans_style.java:1128 build/trans_style.java:1143
-#: build/trans_style.java:1158 build/trans_style.java:1166
+#: build/trans_style.java:1128
+#: build/trans_style.java:1143
+#: build/trans_style.java:1158
+#: build/trans_style.java:1166
 #: build/trans_style.java:1174
 msgid "railwaypoint"
@@ -29149,5 +28565,6 @@
 #. <rule>
 #. <condition k="railway" v="light_rail"/>
-#: build/trans_style.java:1191 build/trans_style.java:1200
+#: build/trans_style.java:1191
+#: build/trans_style.java:1200
 msgid "otherrail"
 msgstr ""
@@ -29188,6 +28605,8 @@
 #. <condition k="railway" v="abandoned"/>
 #. color oldrail
-#: build/trans_style.java:1216 build/trans_style.java:1226
-#: build/trans_style.java:1227 build/trans_style.java:1237
+#: build/trans_style.java:1216
+#: build/trans_style.java:1226
+#: build/trans_style.java:1227
+#: build/trans_style.java:1237
 #: build/trans_style.java:1238
 msgid "oldrail"
@@ -29234,5 +28653,6 @@
 #. <rule>
 #. <condition k="aeroway" v="taxiway"/>
-#: build/trans_style.java:1318 build/trans_style.java:1319
+#: build/trans_style.java:1318
+#: build/trans_style.java:1319
 #: build/trans_style.java:1351
 msgid "aeroway"
@@ -29267,5 +28687,6 @@
 #. <rule>
 #. <condition k="aeroway" v="runway"/>
-#: build/trans_style.java:1335 build/trans_style.java:1343
+#: build/trans_style.java:1335
+#: build/trans_style.java:1343
 msgid "aeroway_dark"
 msgstr "aerovia_escuro"
@@ -29347,7 +28768,10 @@
 #. <rule>
 #. <condition k="aerialway" v="pylon"/>
-#: build/trans_style.java:1383 build/trans_style.java:1391
-#: build/trans_style.java:1399 build/trans_style.java:1407
-#: build/trans_style.java:1415 build/trans_style.java:1423
+#: build/trans_style.java:1383
+#: build/trans_style.java:1391
+#: build/trans_style.java:1399
+#: build/trans_style.java:1407
+#: build/trans_style.java:1415
+#: build/trans_style.java:1423
 msgid "aerialway"
 msgstr ""
@@ -29364,5 +28788,6 @@
 #. <condition k="piste:difficulty" v="easy"/>
 #. color piste_easy
-#: build/trans_style.java:1433 build/trans_style.java:1434
+#: build/trans_style.java:1433
+#: build/trans_style.java:1434
 msgid "piste_easy"
 msgstr "pista_fácil"
@@ -29377,5 +28802,6 @@
 #. <condition k="piste:difficulty" v="intermediate"/>
 #. color piste_intermediate
-#: build/trans_style.java:1442 build/trans_style.java:1443
+#: build/trans_style.java:1442
+#: build/trans_style.java:1443
 msgid "piste_intermediate"
 msgstr "pista_intermediária"
@@ -29390,5 +28816,6 @@
 #. <condition k="piste:difficulty" v="advanced"/>
 #. color piste_advanced
-#: build/trans_style.java:1451 build/trans_style.java:1452
+#: build/trans_style.java:1451
+#: build/trans_style.java:1452
 msgid "piste_advanced"
 msgstr "pista_avançada"
@@ -29403,5 +28830,6 @@
 #. <condition k="piste:difficulty" v="expert"/>
 #. color piste_expert
-#: build/trans_style.java:1460 build/trans_style.java:1461
+#: build/trans_style.java:1460
+#: build/trans_style.java:1461
 msgid "piste_expert"
 msgstr ""
@@ -29416,5 +28844,6 @@
 #. <condition k="piste:difficulty" v="freeride"/>
 #. color piste_freeride
-#: build/trans_style.java:1469 build/trans_style.java:1470
+#: build/trans_style.java:1469
+#: build/trans_style.java:1470
 msgid "piste_freeride"
 msgstr "pista_livre"
@@ -29429,5 +28858,6 @@
 #. <condition k="piste:difficulty" v="novice"/>
 #. color piste_novice
-#: build/trans_style.java:1478 build/trans_style.java:1479
+#: build/trans_style.java:1478
+#: build/trans_style.java:1479
 msgid "piste_novice"
 msgstr "pista_novatos"
@@ -29547,10 +28977,16 @@
 #. <condition k="power" v="generator"/>
 #. <icon annotate="true" src="misc/landmark/power.png" priority="-10000"/>
-#: build/trans_style.java:1490 build/trans_style.java:1504
-#: build/trans_style.java:1512 build/trans_style.java:1521
-#: build/trans_style.java:1529 build/trans_style.java:1537
-#: build/trans_style.java:1545 build/trans_style.java:1553
-#: build/trans_style.java:1561 build/trans_style.java:1569
-#: build/trans_style.java:1577 build/trans_style.java:1585
+#: build/trans_style.java:1490
+#: build/trans_style.java:1504
+#: build/trans_style.java:1512
+#: build/trans_style.java:1521
+#: build/trans_style.java:1529
+#: build/trans_style.java:1537
+#: build/trans_style.java:1545
+#: build/trans_style.java:1553
+#: build/trans_style.java:1561
+#: build/trans_style.java:1569
+#: build/trans_style.java:1577
+#: build/trans_style.java:1585
 #: build/trans_style.java:1593
 msgid "power"
@@ -29565,5 +29001,6 @@
 #. <condition k="man_made" v="pier"/>
 #. color pier
-#: build/trans_style.java:1634 build/trans_style.java:1635
+#: build/trans_style.java:1634
+#: build/trans_style.java:1635
 msgid "pier"
 msgstr "embarcadouro"
@@ -29719,12 +29156,20 @@
 #. <condition k="leisure" v="ice_rink"/>
 #. <icon annotate="true" src="sport/hockey.png"/>
-#: build/trans_style.java:1741 build/trans_style.java:1749
-#: build/trans_style.java:1757 build/trans_style.java:1765
-#: build/trans_style.java:1773 build/trans_style.java:1781
-#: build/trans_style.java:1797 build/trans_style.java:1805
-#: build/trans_style.java:1813 build/trans_style.java:1821
-#: build/trans_style.java:1829 build/trans_style.java:1837
-#: build/trans_style.java:1845 build/trans_style.java:1853
-#: build/trans_style.java:1861 build/trans_style.java:1869
+#: build/trans_style.java:1741
+#: build/trans_style.java:1749
+#: build/trans_style.java:1757
+#: build/trans_style.java:1765
+#: build/trans_style.java:1773
+#: build/trans_style.java:1781
+#: build/trans_style.java:1797
+#: build/trans_style.java:1805
+#: build/trans_style.java:1813
+#: build/trans_style.java:1821
+#: build/trans_style.java:1829
+#: build/trans_style.java:1837
+#: build/trans_style.java:1845
+#: build/trans_style.java:1853
+#: build/trans_style.java:1861
+#: build/trans_style.java:1869
 #: build/trans_style.java:1877
 msgid "leisure"
@@ -29833,9 +29278,14 @@
 #. <condition k="amenity" v="ice_cream"/>
 #. <icon annotate="true" src="food/icecream.png"/>
-#: build/trans_style.java:1887 build/trans_style.java:1895
-#: build/trans_style.java:1903 build/trans_style.java:1911
-#: build/trans_style.java:1919 build/trans_style.java:1927
-#: build/trans_style.java:1935 build/trans_style.java:1943
-#: build/trans_style.java:1951 build/trans_style.java:1959
+#: build/trans_style.java:1887
+#: build/trans_style.java:1895
+#: build/trans_style.java:1903
+#: build/trans_style.java:1911
+#: build/trans_style.java:1919
+#: build/trans_style.java:1927
+#: build/trans_style.java:1935
+#: build/trans_style.java:1943
+#: build/trans_style.java:1951
+#: build/trans_style.java:1959
 #: build/trans_style.java:1967
 msgid "amenity"
@@ -29938,10 +29388,16 @@
 #. <condition k="amenity" v="fuel"/>
 #. <icon annotate="true" src="vehicle/fuel.png" priority="10000"/>
-#: build/trans_style.java:1975 build/trans_style.java:1983
-#: build/trans_style.java:1991 build/trans_style.java:1999
-#: build/trans_style.java:2007 build/trans_style.java:2015
-#: build/trans_style.java:2023 build/trans_style.java:2031
-#: build/trans_style.java:2039 build/trans_style.java:2046
-#: build/trans_style.java:2055 build/trans_style.java:2063
+#: build/trans_style.java:1975
+#: build/trans_style.java:1983
+#: build/trans_style.java:1991
+#: build/trans_style.java:1999
+#: build/trans_style.java:2007
+#: build/trans_style.java:2015
+#: build/trans_style.java:2023
+#: build/trans_style.java:2031
+#: build/trans_style.java:2039
+#: build/trans_style.java:2046
+#: build/trans_style.java:2055
+#: build/trans_style.java:2063
 msgid "amenity_traffic"
 msgstr ""
@@ -30371,23 +29827,42 @@
 #. <condition k="amenity" v="vending_machine"/>
 #. <icon src="transport/ticket-machine.png" priority="-10"/>
-#: build/trans_style.java:2078 build/trans_style.java:2093
-#: build/trans_style.java:2101 build/trans_style.java:2109
-#: build/trans_style.java:2124 build/trans_style.java:2132
-#: build/trans_style.java:2140 build/trans_style.java:2148
-#: build/trans_style.java:2263 build/trans_style.java:2271
-#: build/trans_style.java:2278 build/trans_style.java:2287
-#: build/trans_style.java:2295 build/trans_style.java:2303
-#: build/trans_style.java:2311 build/trans_style.java:2319
-#: build/trans_style.java:2327 build/trans_style.java:2335
-#: build/trans_style.java:2398 build/trans_style.java:2406
-#: build/trans_style.java:2414 build/trans_style.java:2423
-#: build/trans_style.java:2431 build/trans_style.java:2438
-#: build/trans_style.java:2446 build/trans_style.java:2454
-#: build/trans_style.java:2462 build/trans_style.java:2470
-#: build/trans_style.java:2478 build/trans_style.java:2486
-#: build/trans_style.java:2494 build/trans_style.java:2502
-#: build/trans_style.java:2510 build/trans_style.java:2518
-#: build/trans_style.java:2526 build/trans_style.java:2534
-#: build/trans_style.java:2543 build/trans_style.java:2558
+#: build/trans_style.java:2078
+#: build/trans_style.java:2093
+#: build/trans_style.java:2101
+#: build/trans_style.java:2109
+#: build/trans_style.java:2124
+#: build/trans_style.java:2132
+#: build/trans_style.java:2140
+#: build/trans_style.java:2148
+#: build/trans_style.java:2263
+#: build/trans_style.java:2271
+#: build/trans_style.java:2278
+#: build/trans_style.java:2287
+#: build/trans_style.java:2295
+#: build/trans_style.java:2303
+#: build/trans_style.java:2311
+#: build/trans_style.java:2319
+#: build/trans_style.java:2327
+#: build/trans_style.java:2335
+#: build/trans_style.java:2398
+#: build/trans_style.java:2406
+#: build/trans_style.java:2414
+#: build/trans_style.java:2423
+#: build/trans_style.java:2431
+#: build/trans_style.java:2438
+#: build/trans_style.java:2446
+#: build/trans_style.java:2454
+#: build/trans_style.java:2462
+#: build/trans_style.java:2470
+#: build/trans_style.java:2478
+#: build/trans_style.java:2486
+#: build/trans_style.java:2494
+#: build/trans_style.java:2502
+#: build/trans_style.java:2510
+#: build/trans_style.java:2518
+#: build/trans_style.java:2526
+#: build/trans_style.java:2534
+#: build/trans_style.java:2543
+#: build/trans_style.java:2558
 msgid "amenity_light"
 msgstr ""
@@ -30419,5 +29894,6 @@
 #. <condition k="natural" v="spring"/>
 #. <icon annotate="true" src="misc/landmark/spring.png"/>
-#: build/trans_style.java:2156 build/trans_style.java:2164
+#: build/trans_style.java:2156
+#: build/trans_style.java:2164
 #: build/trans_style.java:3403
 msgid "light_water"
@@ -30479,7 +29955,10 @@
 #. <rule>
 #. <condition k="amenity" v="veterinary"/>
-#: build/trans_style.java:2342 build/trans_style.java:2350
-#: build/trans_style.java:2358 build/trans_style.java:2367
-#: build/trans_style.java:2374 build/trans_style.java:2382
+#: build/trans_style.java:2342
+#: build/trans_style.java:2350
+#: build/trans_style.java:2358
+#: build/trans_style.java:2367
+#: build/trans_style.java:2374
+#: build/trans_style.java:2382
 #: build/trans_style.java:2390
 msgid "health"
@@ -30833,25 +30312,46 @@
 #. <condition k="shop" v="shopping_centre"/>
 #. <icon annotate="true" src="shop/mall.png"/>
-#: build/trans_style.java:2568 build/trans_style.java:2576
-#: build/trans_style.java:2584 build/trans_style.java:2592
-#: build/trans_style.java:2600 build/trans_style.java:2608
-#: build/trans_style.java:2616 build/trans_style.java:2624
-#: build/trans_style.java:2632 build/trans_style.java:2640
-#: build/trans_style.java:2648 build/trans_style.java:2656
-#: build/trans_style.java:2664 build/trans_style.java:2672
-#: build/trans_style.java:2680 build/trans_style.java:2688
-#: build/trans_style.java:2696 build/trans_style.java:2704
-#: build/trans_style.java:2712 build/trans_style.java:2720
-#: build/trans_style.java:2728 build/trans_style.java:2736
-#: build/trans_style.java:2744 build/trans_style.java:2752
-#: build/trans_style.java:2760 build/trans_style.java:2768
-#: build/trans_style.java:2776 build/trans_style.java:2784
-#: build/trans_style.java:2792 build/trans_style.java:2800
-#: build/trans_style.java:2808 build/trans_style.java:2816
-#: build/trans_style.java:2824 build/trans_style.java:2832
-#: build/trans_style.java:2840 build/trans_style.java:2848
-#: build/trans_style.java:2856 build/trans_style.java:2864
-#: build/trans_style.java:2872 build/trans_style.java:2880
-#: build/trans_style.java:2888 build/trans_style.java:2896
+#: build/trans_style.java:2568
+#: build/trans_style.java:2576
+#: build/trans_style.java:2584
+#: build/trans_style.java:2592
+#: build/trans_style.java:2600
+#: build/trans_style.java:2608
+#: build/trans_style.java:2616
+#: build/trans_style.java:2624
+#: build/trans_style.java:2632
+#: build/trans_style.java:2640
+#: build/trans_style.java:2648
+#: build/trans_style.java:2656
+#: build/trans_style.java:2664
+#: build/trans_style.java:2672
+#: build/trans_style.java:2680
+#: build/trans_style.java:2688
+#: build/trans_style.java:2696
+#: build/trans_style.java:2704
+#: build/trans_style.java:2712
+#: build/trans_style.java:2720
+#: build/trans_style.java:2728
+#: build/trans_style.java:2736
+#: build/trans_style.java:2744
+#: build/trans_style.java:2752
+#: build/trans_style.java:2760
+#: build/trans_style.java:2768
+#: build/trans_style.java:2776
+#: build/trans_style.java:2784
+#: build/trans_style.java:2792
+#: build/trans_style.java:2800
+#: build/trans_style.java:2808
+#: build/trans_style.java:2816
+#: build/trans_style.java:2824
+#: build/trans_style.java:2832
+#: build/trans_style.java:2840
+#: build/trans_style.java:2848
+#: build/trans_style.java:2856
+#: build/trans_style.java:2864
+#: build/trans_style.java:2872
+#: build/trans_style.java:2880
+#: build/trans_style.java:2888
+#: build/trans_style.java:2896
 #: build/trans_style.java:2905
 msgid "shop"
@@ -30924,8 +30424,12 @@
 #. <condition k="tourism" v="caravan_site"/>
 #. <icon annotate="true" src="accommodation/camping/caravan.png"/>
-#: build/trans_style.java:2915 build/trans_style.java:2923
-#: build/trans_style.java:2931 build/trans_style.java:2939
-#: build/trans_style.java:2947 build/trans_style.java:2955
-#: build/trans_style.java:2963 build/trans_style.java:2971
+#: build/trans_style.java:2915
+#: build/trans_style.java:2923
+#: build/trans_style.java:2931
+#: build/trans_style.java:2939
+#: build/trans_style.java:2947
+#: build/trans_style.java:2955
+#: build/trans_style.java:2963
+#: build/trans_style.java:2971
 msgid "hotel"
 msgstr "hotel"
@@ -31026,9 +30530,14 @@
 #. <condition k="tourism" v="information"/>
 #. <icon annotate="true" src="misc/information.png"/>
-#: build/trans_style.java:2979 build/trans_style.java:2987
-#: build/trans_style.java:2995 build/trans_style.java:3003
-#: build/trans_style.java:3011 build/trans_style.java:3019
-#: build/trans_style.java:3020 build/trans_style.java:3028
-#: build/trans_style.java:3044 build/trans_style.java:3066
+#: build/trans_style.java:2979
+#: build/trans_style.java:2987
+#: build/trans_style.java:2995
+#: build/trans_style.java:3003
+#: build/trans_style.java:3011
+#: build/trans_style.java:3019
+#: build/trans_style.java:3020
+#: build/trans_style.java:3028
+#: build/trans_style.java:3044
+#: build/trans_style.java:3066
 msgid "tourism"
 msgstr "turismo"
@@ -31116,9 +30625,14 @@
 #. <condition k="historic" v="boundary_stone"/>
 #. <icon annotate="true" src="historic/boundary_stone.png"/>
-#: build/trans_style.java:3076 build/trans_style.java:3084
-#: build/trans_style.java:3092 build/trans_style.java:3100
-#: build/trans_style.java:3108 build/trans_style.java:3116
-#: build/trans_style.java:3124 build/trans_style.java:3132
-#: build/trans_style.java:3140 build/trans_style.java:3148
+#: build/trans_style.java:3076
+#: build/trans_style.java:3084
+#: build/trans_style.java:3092
+#: build/trans_style.java:3100
+#: build/trans_style.java:3108
+#: build/trans_style.java:3116
+#: build/trans_style.java:3124
+#: build/trans_style.java:3132
+#: build/trans_style.java:3140
+#: build/trans_style.java:3148
 msgid "historic"
 msgstr "histórico"
@@ -31163,5 +30677,6 @@
 #. <rule>
 #. <condition k="landuse" v="reservoir"/>
-#: build/trans_style.java:3212 build/trans_style.java:3220
+#: build/trans_style.java:3212
+#: build/trans_style.java:3220
 msgid "basin"
 msgstr ""
@@ -31208,5 +30723,6 @@
 #. <rule>
 #. <condition k="landuse" v="commercial"/>
-#: build/trans_style.java:3269 build/trans_style.java:3277
+#: build/trans_style.java:3269
+#: build/trans_style.java:3277
 msgid "retail"
 msgstr "venda"
@@ -31311,7 +30827,10 @@
 #. <condition k="military" v="range"/>
 #. <icon src="misc/landmark/range.png"/>
-#: build/trans_style.java:3326 build/trans_style.java:3361
-#: build/trans_style.java:3369 build/trans_style.java:3377
-#: build/trans_style.java:3385 build/trans_style.java:3393
+#: build/trans_style.java:3326
+#: build/trans_style.java:3361
+#: build/trans_style.java:3369
+#: build/trans_style.java:3377
+#: build/trans_style.java:3385
+#: build/trans_style.java:3393
 msgid "military"
 msgstr "exército"
@@ -31414,7 +30933,10 @@
 #. <condition k="natural" v="cave_entrance"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_style.java:3435 build/trans_style.java:3436
-#: build/trans_style.java:3444 build/trans_style.java:3460
-#: build/trans_style.java:3524 build/trans_style.java:3532
+#: build/trans_style.java:3435
+#: build/trans_style.java:3436
+#: build/trans_style.java:3444
+#: build/trans_style.java:3460
+#: build/trans_style.java:3524
+#: build/trans_style.java:3532
 #: build/trans_style.java:3540
 msgid "natural"
@@ -31553,8 +31075,12 @@
 #. <rule>
 #. <condition k="route" v="pub_crawl"/>
-#: build/trans_style.java:3556 build/trans_style.java:3564
-#: build/trans_style.java:3572 build/trans_style.java:3580
-#: build/trans_style.java:3588 build/trans_style.java:3596
-#: build/trans_style.java:3604 build/trans_style.java:3612
+#: build/trans_style.java:3556
+#: build/trans_style.java:3564
+#: build/trans_style.java:3572
+#: build/trans_style.java:3580
+#: build/trans_style.java:3588
+#: build/trans_style.java:3596
+#: build/trans_style.java:3604
+#: build/trans_style.java:3612
 msgid "route"
 msgstr "rota"
@@ -31643,11 +31169,18 @@
 #. <rule>
 #. <condition k="boundary" v="national_park"/>
-#: build/trans_style.java:3622 build/trans_style.java:3630
-#: build/trans_style.java:3634 build/trans_style.java:3638
-#: build/trans_style.java:3642 build/trans_style.java:3646
-#: build/trans_style.java:3650 build/trans_style.java:3654
-#: build/trans_style.java:3658 build/trans_style.java:3662
-#: build/trans_style.java:3666 build/trans_style.java:3671
-#: build/trans_style.java:3679 build/trans_style.java:3687
+#: build/trans_style.java:3622
+#: build/trans_style.java:3630
+#: build/trans_style.java:3634
+#: build/trans_style.java:3638
+#: build/trans_style.java:3642
+#: build/trans_style.java:3646
+#: build/trans_style.java:3650
+#: build/trans_style.java:3654
+#: build/trans_style.java:3658
+#: build/trans_style.java:3662
+#: build/trans_style.java:3666
+#: build/trans_style.java:3671
+#: build/trans_style.java:3679
+#: build/trans_style.java:3687
 #: build/trans_style.java:3695
 msgid "boundary"
@@ -31798,10 +31331,16 @@
 #. <condition k="place" v="islet"/>
 #. <icon annotate="true" src="place/islet.png"/>
-#: 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: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
 msgid "place"
@@ -31897,5 +31436,6 @@
 #. <action class="SetWaypointAction" params="Test X"/>
 #. </button>
-#: build/trans_surveyor.java:93 build/trans_surveyor.java:97
+#: build/trans_surveyor.java:93
+#: build/trans_surveyor.java:97
 msgid "Test"
 msgstr "Testar..."
@@ -31955,6 +31495,8 @@
 #. node : W : highway == residential
 #. node : W : highway == unclassified
-#: build/trans_validator.java:42 build/trans_validator.java:43
-#: build/trans_validator.java:44 build/trans_validator.java:45
+#: build/trans_validator.java:42
+#: build/trans_validator.java:43
+#: build/trans_validator.java:44
+#: build/trans_validator.java:45
 #: build/trans_validator.java:46
 msgid "wrong highway tag on a node"
@@ -31969,5 +31511,6 @@
 #. way  : I : highway == secondary && ref != *
 #. way  : I : highway == tertiary && ref != *
-#: build/trans_validator.java:48 build/trans_validator.java:49
+#: build/trans_validator.java:48
+#: build/trans_validator.java:49
 #: build/trans_validator.java:50
 msgid "highway without a reference"
@@ -32012,5 +31555,6 @@
 #. way  : I : waterway == * && layer != *                         # waterway without layer tag
 #. way  : I : highway == footway && maxspeed == *
-#: build/trans_validator.java:66 build/trans_validator.java:67
+#: build/trans_validator.java:66
+#: build/trans_validator.java:67
 msgid "maxspeed used for footway"
 msgstr "velocidade máxima usada para via de pedestres"
@@ -32040,5 +31584,6 @@
 #. *    : W : natural == water && waterway == *                   # unusual tag combination
 #. *    : W : highway == * && waterway == *
-#: build/trans_validator.java:78 build/trans_validator.java:79
+#: build/trans_validator.java:78
+#: build/trans_validator.java:79
 msgid "unusual tag combination"
 msgstr "Combinação de tags não ususal"
@@ -32172,38 +31717,26 @@
 #~ msgid "Preparing..."
 #~ msgstr "Preparando..."
-
 #~ msgid "Uploading..."
 #~ msgstr "Enviando..."
-
 #~ msgid "Unknown version"
 #~ msgstr "Versão desconhecida"
-
 #~ msgid "Enter Password"
 #~ msgstr "Digite a Senha"
-
 #~ msgid "Unsaved Changes"
 #~ msgstr "Alterações Não Salvas"
-
 #~ msgid "Do not show again"
 #~ msgstr "Não mostrar novamente"
-
 #~ msgid "Rotate"
 #~ msgstr "Rotacionar"
-
 #~ msgid "Move"
 #~ msgstr "Mover"
-
 #~ msgid "Found <nd> element in non-way."
 #~ msgstr "Encontrado elemento <nd> em non-way."
-
 #~ msgid "Error during parse."
 #~ msgstr "Erro durante interpretação."
-
 #~ msgid "NullPointerException, possibly some missing tags."
 #~ msgstr "Exceção NullPointerException, possivelmente faltam algumas tags."
-
 #~ msgid "Found <member> element in non-relation."
 #~ msgstr "Encontrado elemento <member> em non-relation."
-
 #~ msgid ""
 #~ "Warning - loading of {0} plugin was requested. This plugin is no longer "
@@ -32212,14 +31745,10 @@
 #~ "Atenção - o carregamento do plugin {0} foi solicitado. Este plugin não é "
 #~ "mais necessário."
-
 #~ msgid "Incorrect password or username."
 #~ msgstr "Senha ou usuário incorreto."
-
 #~ msgid "Ill-formed node id"
 #~ msgstr "Identificação de nó mal-formada"
-
 #~ msgid "Plugin not found: {0}."
 #~ msgstr "Plugin não encontrado: {0}."
-
 #~ msgid ""
 #~ "(You can change the number of days after which this warning appears<br>by "
@@ -32228,11 +31757,8 @@
 #~ "(Você pode alterar o número de dias depois que este irá "
 #~ "aparecer<br>definindo a opção de configuração 'pluginmanager.warntime'.)"
-
 #~ msgid "<nd> has zero ref"
 #~ msgstr "<nd> tem ref zero"
-
 #~ msgid "Please report a ticket at {0}"
 #~ msgstr "Por favor, reporte um erro em {0}"
-
 #~ msgid ""
 #~ "The plugin could not be removed. Please tell the people you got JOSM from "
@@ -32241,8 +31767,6 @@
 #~ "O plugin não pode ser removido. Por favor, reporte o problema aos "
 #~ "desenvolvedores do JOSM."
-
 #~ msgid "Include your steps to get to the error (as detailed as possible)!"
 #~ msgstr "Inclua os passos para repetir o erro (o mais detalhado possível)!"
-
 #~ msgid ""
 #~ "Try updating to the newest version of JOSM and all plugins before "
@@ -32251,20 +31775,14 @@
 #~ "Tente atualizar para a última versão do JOSM e plugins antes de reportar "
 #~ "um bug."
-
 #~ msgid "Be sure to include the following information:"
 #~ msgstr "Tenha certeza de incluir a seguinte informação:"
-
 #~ msgid "Empty member in relation."
 #~ msgstr "Membro vazio na relação."
-
 #~ msgid "multipolygon way ''{0}'' is not closed."
 #~ msgstr "via multipolígonos \"{0}\" não está fechada."
-
 #~ msgid "No useful role ''{0}'' for Way ''{1}''."
 #~ msgstr "Regra não aplicável ''{0}'' para Way ''{1}''."
-
 #~ msgid "Way ''{0}'' with less than two points."
 #~ msgstr "Way ''{0}'' com menos de dois pontos."
-
 #~ msgid ""
 #~ "There were problems with the following plugins:\n"
@@ -32275,8 +31793,6 @@
 #~ "\n"
 #~ "{0}"
-
 #~ msgid "Update"
 #~ msgstr "Atualizar"
-
 #~ msgid ""
 #~ "Activating the updated plugins failed. Check if JOSM has the permission "
@@ -32285,24 +31801,17 @@
 #~ "A ativação dos plugins atualizados falhou. Verifique se o JOSM tem "
 #~ "permissão de sobreescrever os existentes."
-
 #~ msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
 #~ msgstr "Pulando uma via porque ela inclui um nó que não existe: {0}\n"
-
 #~ msgid "Hint: Some changes came from uploading new data to the server."
 #~ msgstr ""
 #~ "Dica: Algumas alterações vieram ao enviar novos dados para o servidor."
-
 #~ msgid "Intersection between ways ''{0}'' and ''{1}''."
 #~ msgstr "Interseção entre as vias \"{0}\" e \"{1}\"."
-
 #~ msgid "No outer way for multipolygon ''{0}''."
 #~ msgstr "Não há via externa no multipolígono \"{0}\"."
-
 #~ msgid "Inner way ''{0}'' is outside."
 #~ msgstr "Via interna \"{0}\" está fora."
-
 #~ msgid "Cannot open preferences directory: {0}"
 #~ msgstr "Não foi possível abrir o diretório de preferências: {0}"
-
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32317,8 +31826,6 @@
 #~ "utilizando um servidor WMS francês.\n"
 #~ "Não transfira nenhum dado após esta mensagem."
-
 #~ msgid "EPSG:4326"
 #~ msgstr "EPSG:4326"
-
 #~ msgid ""
 #~ "IMPORTANT : data positioned far away from\n"
@@ -32333,125 +31840,84 @@
 #~ "Desfaça sua última ação, salve seu trabalho\n"
 #~ "e comece uma nova camada na nova zona."
-
 #~ msgid "Conflicting relation"
 #~ msgstr "Relação conflitando"
-
 #~ msgid "Login"
 #~ msgstr "Login"
-
 #~ msgid "zoom"
 #~ msgstr "zoom"
-
 #~ msgid "Please enter a search string"
 #~ msgstr "Por favor, entre com texto de busca"
-
 #~ msgid "Cannot read place search results from server"
 #~ msgstr "Não foi possível ler resultados de busca de place do servidor"
-
 #~ msgid "name"
 #~ msgstr "nome"
-
 #~ msgid "x from"
 #~ msgstr "x de"
-
 #~ msgid "Select a bookmark first."
 #~ msgstr "Selecione um favorito primeiro"
-
 #~ msgid "to"
 #~ msgstr "para"
-
 #~ msgid "y from"
 #~ msgstr "y de"
-
 #~ msgid "Download Area"
 #~ msgstr "Baixar Área"
-
 #~ msgid "Use preset ''{0}'' of group ''{1}''"
 #~ msgstr "Usar preferência ''{0}'' do grupo ''{1}''"
-
 #~ msgid "Use preset ''{0}''"
 #~ msgstr "Usar preferencia ''{0}''"
-
 #~ msgid "Edit Properties"
 #~ msgstr "Editar Propriedades"
-
 #~ msgid "Tags (empty value deletes tag)"
 #~ msgstr "Etiquetas (um valor nulo excluir etiqueda)"
-
 #~ msgid "Occupied By"
 #~ msgstr "Ocupado por"
-
 #~ msgid "Edit new relation"
 #~ msgstr "Editar nova relação"
-
 #~ msgid "Move Up"
 #~ msgstr "Mover para cima"
-
 #~ msgid "Remove all currently selected objects from relation"
 #~ msgstr "Eliminar todos objetos selecionados da relação"
-
 #~ msgid "Remove Selected"
 #~ msgstr "Excluir selecionados"
-
 #~ msgid "Add all currently selected objects as members"
 #~ msgstr "Adicionar todos os objetos selecionados como membros"
-
 #~ msgid "Move Down"
 #~ msgstr "Mover para baixo"
-
 #~ msgid "Cannot connect to server."
 #~ msgstr "Não foi possível conectar ao servidor."
-
 #~ msgid "Error parsing server response."
 #~ msgstr "Erro analizado resposta do servidor"
-
 #~ msgid "There were conflicts during import."
 #~ msgstr "Existiram conflitos durante a importação"
-
 #~ msgid "Relation Editor: {0}"
 #~ msgstr "Editor de relações: {0}"
-
 #~ msgid "Authors: {0}"
 #~ msgstr "Autores: {0}"
-
 #~ msgid "There are unsaved changes. Delete the layer anwyay?"
 #~ msgstr "Existem mudanças não-salvas. Excluir camada mesmo assim?"
-
 #~ msgid "Delete the selected layer."
 #~ msgstr "Excluir camada selecionada."
-
 #~ msgid "Merge the layer directly below into the selected layer."
 #~ msgstr "Unir camada diretamente inferior com camada selecionada."
-
 #~ msgid "Merging conflicts."
 #~ msgstr "Combinar conflitos"
-
 #~ msgid "Some of the nodes are (almost) in the line"
 #~ msgstr "Alguns dos nós estão (praticamente) na linha"
-
 #~ msgid "Combine ways with different memberships?"
 #~ msgstr "Combinar caminhos com membros diferentes?"
-
 #~ msgid "All the ways were empty"
 #~ msgstr "Todos caminhos estavam vazios"
-
 #~ msgid "Those nodes are not in a circle."
 #~ msgstr "Estes nós não estão em um círculo"
-
 #~ msgid "Please select at least one task to download"
 #~ msgstr "Por favor selecione no mínimo uma tarefa para baixar"
-
 #~ msgid "JOSM Online Help"
 #~ msgstr "Ajuda Online do JOSM"
-
 #~ msgid "Can only edit help pages from JOSM Online Help"
 #~ msgstr "Pode-se editar somente páginas de ajuda online do JOSM"
-
 #~ msgid "Error while loading page {0}"
 #~ msgstr "Erro ao carregar página {0}"
-
 #~ msgid "History of Element"
 #~ msgstr "Histórico do Elemento"
-
 #~ msgid ""
 #~ "The selected nodes have differing relation memberships.  Do you still "
@@ -32460,36 +31926,25 @@
 #~ "Os nós selecionados tem relações de usuários diferentes. Você ainda "
 #~ "pretende uni-los?"
-
 #~ msgid "Merge nodes with different memberships?"
 #~ msgstr "Unir nós com usuários diferentes?"
-
 #~ msgid "Merge Anyway"
 #~ msgstr "Unir mesmo assim"
-
 #~ msgid "Please select one or more closed ways of at least four nodes."
 #~ msgstr ""
 #~ "Por favor selecione um ou mais caminhos fechados de no mínimo quatro nós."
-
 #~ msgid "Only two nodes allowed"
 #~ msgstr "Somente dois nós permitidos"
-
 #~ msgid "Only one node selected"
 #~ msgstr "Somente um nó selecionado"
-
 #~ msgid "An error occurred while restoring backup file."
 #~ msgstr "Ocorreu um erro enquanto o arquivo backup estava sendo restaurado."
-
 #~ msgid "An error occurred while saving."
 #~ msgstr "Ocorreu um erro durante o salvamento."
-
 #~ msgid "aqueduct"
 #~ msgstr "aqueduto"
-
 #~ msgid "Open in Browser"
 #~ msgstr "Abrir no Navegador Web"
-
 #~ msgid "Update Data"
 #~ msgstr "Atualizar Dados"
-
 #~ msgid ""
 #~ "No data to update found. Have you already opened or downloaded a data "
@@ -32498,49 +31953,34 @@
 #~ "Não foram encontrados dados a atualizar. Você já abriu ou baixou uma "
 #~ "camada de dados?"
-
 #~ msgid "No data imported."
 #~ msgstr "Não há dados importados."
-
 #~ msgid "Data Layer"
 #~ msgstr "Camada de Dados"
-
 #~ msgid "YAHOO (GNOME)"
 #~ msgstr "YAHOO! (GNOME)"
-
 #~ msgid "YAHOO (WebKit GTK)"
 #~ msgstr "YAHOO! (WebKit GTK)"
-
 #~ msgid "YAHOO (WebKit)"
 #~ msgstr "YAHOO! (WebKit)"
-
 #~ msgid "YAHOO (GNOME Fix)"
 #~ msgstr "YAHOO! (GNOME Fix)"
-
 #~ msgid "Version number missing from OSM data"
 #~ msgstr "Faltando número de versão nos dados dos mapas"
-
 #~ msgid "Could not read from URL: \"{0}\""
 #~ msgstr "Não foi possível ler da URL: \"{0}\""
-
 #~ msgid "Set the language."
 #~ msgstr "Escolha o idioma."
-
 #~ msgid "File not found"
 #~ msgstr "Arquivo não encontrado"
-
 #~ msgid "Images for {0}"
 #~ msgstr "Imagens para {0}"
-
 #~ msgid "image"
 #~ msgid_plural "images"
 #~ msgstr[0] "imagem"
 #~ msgstr[1] "imagens"
-
 #~ msgid "Synchronize Time with GPS Unit"
 #~ msgstr "Sincronizar Tempo com Unidade GPS"
-
 #~ msgid "Image"
 #~ msgstr "Imagem"
-
 #~ msgid ""
 #~ "Internal Error: cannot check conditions for no layer. Please report this "
@@ -32549,29 +31989,20 @@
 #~ "Erro interno: Não é possível verificar condições sem nenhuma camada. Por "
 #~ "favor, relate isso como uma falha do programa."
-
 #~ msgid "Update Selection"
 #~ msgstr "Atualizar Seleção"
-
 #~ msgid "Updating primitive"
 #~ msgstr "Atualizando primitiva"
-
 #~ msgid "Conflict detected"
 #~ msgstr "Detectado conflito"
-
 #~ msgid "Primitive already deleted"
 #~ msgstr "Primitiva já deletada"
-
 #~ msgid "The following errors occurred during mass download:"
 #~ msgstr "Os seguintes erros aconteceram durante a transferência em massa:"
-
 #~ msgid "Error while communicating with server."
 #~ msgstr "Erro de comunicação com o servidor."
-
 #~ msgid "Upload to OSM..."
 #~ msgstr "Enviar para o OSM..."
-
 #~ msgid "Upload to OSM API failed"
 #~ msgstr "Envio para API OSM falhou"
-
 #~ msgid ""
 #~ "<html>Uploading <strong>failed</strong> because a primitive you tried "
@@ -32582,8 +32013,6 @@
 #~ "tentou<br>apagar no servidor já está apagada.<br><br>A mensagem de erro é:"
 #~ "<br>{0}</html>"
-
 #~ msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
 #~ msgstr "Cabeçalho de erro \"{0}\" não se encaixa no padrão \"{1}\""
-
 #~ msgid ""
 #~ "WARNING: launching browser windows for the first {0} of {1} selected "
@@ -32592,5 +32021,4 @@
 #~ "AVISO: lançando janela do browser para somente as primeiras {0} das {1} "
 #~ "primitivas selecionadas"
-
 #~ msgid ""
 #~ "Current number of changes exceeds the max. number of changes, current is "
@@ -32599,5 +32027,4 @@
 #~ "O número de alterações atuais ultrapassa o número máximo de alterações. O "
 #~ "número atual é {0}, o máximo é {1}"
-
 #~ msgid ""
 #~ "The selected ways have differing relation memberships.  Do you still want "
@@ -32606,17 +32033,12 @@
 #~ "Os caminhos selecionados têm filiações diferentes. Você pretende uni-los "
 #~ "mesmo assim?"
-
 #~ msgid "unnamed"
 #~ msgstr "sem nome"
-
 #~ msgid "No document open so nothing to save."
 #~ msgstr "Nenhum documento aberto, portanto não há nada a salvar."
-
 #~ msgid "Unknown file extension."
 #~ msgstr "Extensão de arquivo desconhecida."
-
 #~ msgid "Failed to initialize API. Please try again later."
 #~ msgstr "Houve uma falha ao inicializar a API. Tente novamente mais tarde."
-
 #~ msgid ""
 #~ "A relation membership was copied to all new ways.\n"
@@ -32625,5 +32047,4 @@
 #~ "Uma filiação de relação foi copiada para todos os novos caminhos.\n"
 #~ "Por favor, verifique e corrija quando necessário."
-
 #~ msgid ""
 #~ "A role based relation membership was copied to all new ways.\n"
@@ -32633,5 +32054,4 @@
 #~ "novos caminhos.\n"
 #~ "Verifique e corrija quando necessário."
-
 #~ msgid ""
 #~ "<html>You are using the EPSG:4326 projection which might lead<br>to "
@@ -32642,20 +32062,14 @@
 #~ "a<br>resultados indesejados quando fizer alinhamentos retangulares."
 #~ "<br>Mude sua projeção para evitar esta notificação.<br>Pretende continuar?"
-
 #~ msgid "Non-Way ''{0}'' in multipolygon."
 #~ msgstr "\"{0}\" não é um caminho no multipolígono."
-
 #~ msgid "Load Selection"
 #~ msgstr "Carregar Seleção"
-
 #~ msgid "Contact {0}..."
 #~ msgstr "Contato {0}..."
-
 #~ msgid "Wrong number of parameters for nodes operator."
 #~ msgstr "Número de parametros incorreto para operador de nós."
-
 #~ msgid "Incorrect value of id operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto do operador de id: {0}. Se esperava um número."
-
 #~ msgid ""
 #~ "Incorrect value of nodes operator: {0}. Nodes operator expects number of "
@@ -32664,29 +32078,20 @@
 #~ "Valor incorreto de operador de nós: {0}. O operador de nós espera un "
 #~ "número de nós ou um intervalo, por exemplos, os nós:10-20"
-
 #~ msgid "Expected closing parenthesis."
 #~ msgstr "Fechamento de parenteses esperado."
-
 #~ msgid "Parsing error in URL: \"{0}\""
 #~ msgstr "Erro processando URL: \"{0}\""
-
 #~ msgid "Purging 1 primitive"
 #~ msgstr "Purgando 1 primitiva"
-
 #~ msgid "removing reference from way {0}"
 #~ msgstr "removendo referência de caminho {0}"
-
 #~ msgid "Split way segment"
 #~ msgstr "Dividir segmento de via"
-
 #~ msgid "nodes"
 #~ msgstr "nós"
-
 #~ msgid "ways"
 #~ msgstr "caminhos"
-
 #~ msgid "relations"
 #~ msgstr "relações"
-
 #~ msgid ""
 #~ "The projection \"{0}\" is designed for\n"
@@ -32703,16 +32108,12 @@
 #~ "em um dataset da Suíça ou de Liechtenstein.\n"
 #~ "Não faça o upload de nenhuma informação depois desta mensagem."
-
 #~ msgid "Open file (as raw gps, if .gpx)"
 #~ msgstr "Abrir arquivo (como raw gps, se .gpx)"
-
 #~ msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
 #~ msgstr ""
 #~ "Não foi possível encontrar primitiva com id {0} e versão {1} no conjunto "
 #~ "de dados"
-
 #~ msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n"
 #~ msgstr "Em vez de --download=<bbox>, você pode especificar osm://<bbox>\n"
-
 #~ msgid ""
 #~ "Parameters are read in the order they are specified, so make sure you "
@@ -32723,101 +32124,68 @@
 #~ "certeza que você está carregando\n"
 #~ "alguma coisa antes de --selection"
-
 #~ msgid "Error while parsing"
 #~ msgstr "Erro enquanto analisando"
-
 #~ msgid "parameter '{0}' must not be null"
 #~ msgstr "parâmetro '{0}' não pode ser nulo"
-
 #~ msgid "Oberpfalz Geofabrik.de"
 #~ msgstr "Oberpfalz Geofabrik.de"
-
 #~ msgid "Boat"
 #~ msgstr "Barco"
-
 #~ msgid "Motorboat"
 #~ msgstr "Barco motorizado"
-
 #~ msgid "Footway"
 #~ msgstr "Calçada"
-
 #~ msgid "Cycleway"
 #~ msgstr "Ciclovia"
-
 #~ msgid "No data"
 #~ msgstr "Não há dados"
-
 #~ msgid ">"
 #~ msgstr ">"
-
 #~ msgid "History item"
 #~ msgstr "Historia do iten"
-
 #~ msgid "Read GPX..."
 #~ msgstr "Ler GPX..."
-
 #~ msgid "Anonymous"
 #~ msgstr "Anônimo"
-
 #~ msgid "Copy defaults"
 #~ msgstr "Copiar padrões"
-
 #~ msgid "All images"
 #~ msgstr "Todas as imagens"
-
 #~ msgid "Default Values"
 #~ msgstr "Valores Predefinidos"
-
 #~ msgid "Optional"
 #~ msgstr "Opcional"
-
 #~ msgid "Continue anyway"
 #~ msgstr "Continuar assim mesmo"
-
 #~ msgid "Are you sure?"
 #~ msgstr "Você tem certeza?"
-
 #~ msgid "<multiple>"
 #~ msgstr "<múltiplo>"
-
 #~ msgid "Sync clock"
 #~ msgstr "Sincronizar relógio"
-
 #~ msgid "More details"
 #~ msgstr "Mais detalhes"
-
 #~ msgid "Conflicts in data"
 #~ msgstr "Conflitos nos dados"
-
 #~ msgid "{0} within the track."
 #~ msgstr "{0} dentro da faixa"
-
 #~ msgid "The date in file \"{0}\" could not be parsed."
 #~ msgstr "A data no arquivo \"{0}\" não pode ser analisada."
-
 #~ msgid "Shop"
 #~ msgstr "Loja"
-
 #~ msgid "Edit Station"
 #~ msgstr "Editar Estação"
-
 #~ msgid "Edit Information Office"
 #~ msgstr "Editar Centro de Informações Turísticas"
-
 #~ msgid "Map Type"
 #~ msgstr "Tipo de Mapa"
-
 #~ msgid "map"
 #~ msgstr "mapa"
-
 #~ msgid "citymap"
 #~ msgstr "mapa da cidade"
-
 #~ msgid "bicyclemap"
 #~ msgstr "mapa de ciclovias"
-
 #~ msgid "Board Type"
 #~ msgstr "Tipo de Quadro"
-
 #~ msgid ""
 #~ "Caught security exception for setAlwaysOnTop(). Ignoring. Exception was: "
@@ -32826,38 +32194,26 @@
 #~ "Levantada exceção de segurança setAlwaysOnTop(). Ignorando. Exceção foi: "
 #~ "{0}"
-
 #~ msgid "Linked"
 #~ msgstr "Vinculado"
-
 #~ msgid "No time for point {0} x {1}"
 #~ msgstr "Sem tempo para ponto {0} x {1}"
-
 #~ msgid "Cannot read time \"{0}\" from point {1} x {2}"
 #~ msgstr "Não foi possível ler tempo \"{0}\" para ponto {1} x {2}"
-
 #~ msgid "No images with readable timestamps found."
 #~ msgstr "Não foram encontradas imagens com dados de tempo legíveis"
-
 #~ msgid "GPS start: {0}"
 #~ msgstr "Iniciar GPS: {0}"
-
 #~ msgid "current delta: {0}s"
 #~ msgstr "delta atual: {0}s"
-
 #~ msgid "GPS end: {0}"
 #~ msgstr "Finalizar GPS: {0}"
-
 #~ msgid "timezone difference: "
 #~ msgstr "diferença de zona horária: "
-
 #~ msgid "Time entered could not be parsed."
 #~ msgstr "O tempo informado não pode ser analisado."
-
 #~ msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
 #~ msgstr "Digite data de exibição (mm/dd/aaaa HH:MM:SS)"
-
 #~ msgid "GPS unit timezone (difference to photo)"
 #~ msgstr "Zona horária do GPS (diferença com foto)"
-
 #~ msgid ""
 #~ "Enable to upload all changes in one request, disable to use one request "
@@ -32866,21 +32222,15 @@
 #~ "Habilitar para envio de todas modificações em uma chamada, desabilitar "
 #~ "para usar uma chamada por primitiva"
-
 #~ msgid "Confirmation"
 #~ msgstr "Confirmação"
-
 #~ msgid "Delete all"
 #~ msgstr "Apagar tudo"
-
 #~ msgid "Download referrers from OSM..."
 #~ msgstr "Baixando referencias desde OSM..."
-
 #~ msgid "Gauss-Laborde Réunion 1947"
 #~ msgstr "Gauss-Laborde Réunion 1947"
-
 #~ msgid "Help page missing. Create it in <A HREF=\"{0}\">English</A>."
 #~ msgstr ""
 #~ "Faltando página de Ajuda. Crie uma em <A HREF=\"{0}\">português</A>."
-
 #~ msgid ""
 #~ "Help page missing. Create it in <A HREF=\"{0}\">English</A> or <A HREF="
@@ -32889,62 +32239,42 @@
 #~ "Página de ajuda. Crie-a em <A HREF=\"{0}\">English</A> ou <A HREF=\"{1}"
 #~ "\">português</A>."
-
 #~ msgid "Didn't find an primitive with id {0} in this dataset"
 #~ msgstr "Não consegui encontrar um primitivo com o id {0} neste dataset."
-
 #~ msgid "Parameter ''{0}'' must not be null."
 #~ msgstr "parâmetro ''{0}'' não pode ser nulo"
-
 #~ msgid "Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''."
 #~ msgstr "se esperava instância de OsmDataLayer ou GpxLayer. Obtido \"{0}\""
-
 #~ msgid "Unexpected return value. Got {0}."
 #~ msgstr "valor não esperado de retorno. Veio {0}"
-
 #~ msgid "Parameter ''{0}'' > 0 expected. Got ''{1}''."
 #~ msgstr "parametro {0} > 0 necessário. Obtido {1}."
-
 #~ msgid "Parameter ''{0}'' is not an acceptable class. Got ''{1}''."
 #~ msgstr "parametro ''{0}'' não é uma classe aceitável, obtido ''{1}''"
-
 #~ msgid "There's no primitive with version {0} in this history."
 #~ msgstr "Não há primitiva com versão {0} neste histórico"
-
 #~ msgid "There's no version valid at date ''{0}'' in this history."
 #~ msgstr "Não há versão válida na data ''{0}'' neste histórico"
-
 #~ msgid "Parameter ''{0}'' in range 0..{1} expected. Got ''{2}''."
 #~ msgstr "parâmetro ''{0}'' no intervalo  de 0..{1} esperado, obtido {2}"
-
 #~ msgid "No earliest version found. History is empty."
 #~ msgstr "não foi encontrada versão anterior. Histórico está vazio."
-
 #~ msgid "No latest version found. History is empty."
 #~ msgstr "não foi encontrada a última versão. Histórico está vazio."
-
 #~ msgid "Parameter current out of range. Got {0}."
 #~ msgstr "parâmetro atual fora do intervalo: obtido {0}"
-
 #~ msgid "Unexpected column index. Got {0}."
 #~ msgstr "indice inesperado na coluna. Obtido {0}"
-
 #~ msgid "Parameter 'col' must be 0 or 1. Got {0}."
 #~ msgstr "O parâmetro 'col' deve ser 0 ou 1. Obtido {0}"
-
 #~ msgid "Index out of bounds. Got {0}."
 #~ msgstr "índice fora dos limites. Obtido {0}"
-
 #~ msgid "Display the history of the selected primitive."
 #~ msgstr "Mostrar histórico da primitiva selecionada"
-
 #~ msgid "Could not read ''{0}''."
 #~ msgstr "Não foi possível ler \"{0}\""
-
 #~ msgid "Always move and don't show dialog again"
 #~ msgstr "Mover sempre e não mostrar dica outraves"
-
 #~ msgid "Can't search because there is no loaded data."
 #~ msgstr "Não pode procurar porque não exite informação carregada."
-
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\".<br>Delete from "
@@ -32953,5 +32283,4 @@
 #~ "<html>Selecção \"{0}\" é usada pela relação \"{1}\".<br>Apagar da relação?"
 #~ "</html>"
-
 #~ msgid ""
 #~ "<html>Selection \"{0}\" is used by relation \"{1}\" with role {2}."
@@ -32960,11 +32289,8 @@
 #~ "<html>A selecção \"{0}\" é usada pela relação \"{1}\" com o papel {2}."
 #~ "<br>Apagar da relação?</html>"
-
 #~ msgid "Replace"
 #~ msgstr "Substituir"
-
 #~ msgid "Parameter ''{0}'' must not be null"
 #~ msgstr "Parâmetro \"{0}\" não pode ser nulo"
-
 #~ msgid ""
 #~ "<html>There are unresolved conflicts in layer ''{0}''.<br>You have to "
@@ -32973,17 +32299,12 @@
 #~ "<html>Existem conflitos não-resolvidos na camada ''{0}''.<br>Você precisa "
 #~ "resolvê-los primeiro.</html>"
-
 #~ msgid "Current changeset is null. Can't upload data."
 #~ msgstr "Changeset atual é nulo. Não há como enviar os dados."
-
 #~ msgid "Id > 0 required, got {0}"
 #~ msgstr "Exige-se Id > 0, obtido {0}"
-
 #~ msgid "Wrong number of parameters for tags operator."
 #~ msgstr "Número errado de parâmetros para o operador de tags"
-
 #~ msgid "Parameter ''{0}'' must not be empty"
 #~ msgstr "O parâmetro \"{0}\" não pode estar vazio"
-
 #~ msgid ""
 #~ "The selected way(s) have nodes outside of the downloaded data region.\n"
@@ -32994,5 +32315,4 @@
 #~ "Isto pode acabar apagando nós acidentalmente.\n"
 #~ "Deseja continuar?"
-
 #~ msgid ""
 #~ "The selection contains {0} way. Are you sure you want to simplify it?"
@@ -33003,5 +32323,4 @@
 #~ msgstr[1] ""
 #~ "A seleção contém {0} vias. Tem certeza que quer simplificar todas?"
-
 #~ msgid ""
 #~ "Incorrect value of tags operator: {0}. Tags operator expects number of "
@@ -33010,21 +32329,16 @@
 #~ "Valor incorreto para operador de etiquetas: {0}. Operador de tags espera "
 #~ "número de etiquetas ou intervalo, por exemplo, tags:1 ou tags:2-5"
-
 #~ msgid "Incorrect value of changeset operator: {0}. Number is expected."
 #~ msgstr ""
 #~ "Valor incorreto para operador de conjunto de modificações: {0}. Um número "
 #~ "é esperado."
-
 #~ msgid "Incorrect value of version operator: {0}. Number is expected."
 #~ msgstr "Valor incorreto de operador de versão: {0}. Número é esperado."
-
 #~ msgid "Enter a changset id"
 #~ msgstr "Digite o ID do changeset"
-
 #~ msgid "<html>Cannot open directory.<br>Please select a file!</html>"
 #~ msgstr ""
 #~ "<html>Não foi possível abrir diretório.<br>Por favor, selecione um "
 #~ "arquivo!</html>"
-
 #~ msgid ""
 #~ "<b>Zoom:</b> Mousewheel, double click or Ctrl + Up/Down <b>Move map:</b> "
@@ -33035,14 +32349,10 @@
 #~ "</b> Segure o botão direito do mouse e mova-o ou use as setas do teclado. "
 #~ "<b>Selecionar:</b> Segure o botão esquerdo do mouse e desenhe a área."
-
 #~ msgid "Use all their elements"
 #~ msgstr "Usar todos elementos deles"
-
 #~ msgid "<number>"
 #~ msgstr "<número>"
-
 #~ msgid "Use all my elements"
 #~ msgstr "Use todos os meus elementos"
-
 #~ msgid ""
 #~ "You are about to delete nodes outside of the area you have downloaded."
@@ -33053,2 +32363,3 @@
 #~ "<br> Isto pode causar problemas, já que outros objetos que você não pode "
 #~ "ver podem estar usando estes pontos.<br> Deseja realmente apagar?"
+
Index: /applications/editors/josm/i18n/po/ro.po
===================================================================
--- /applications/editors/josm/i18n/po/ro.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/ro.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: JOSM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 21:25+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:40+0000\n"
 "Last-Translator: Adi Roiban <adi@roiban.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=(n == 1 ? 0: (((n % 100 > 19) || ((n % 100 "
 "== 0) && (n != 0))) ? 2: 1));\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:38+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:46+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: ROMANIA\n"
@@ -70,5 +70,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1194,5 +1194,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Nu pot muta obiecte în afara lumii."
@@ -1505,5 +1505,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2247,9 +2247,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2330,26 +2330,26 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2367,6 +2367,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2378,9 +2378,9 @@
 msgstr "Selectaţi"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2389,17 +2389,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Move them"
+msgstr ""
+
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
+msgid "Undo move"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Move them"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
-msgid "Undo move"
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
 #, java-format
 msgid ""
@@ -2409,18 +2409,18 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
+msgid "Release the mouse button to select the objects in the rectangle."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
-msgid "Release the mouse button to select the objects in the rectangle."
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgid "Release the mouse button to stop rotating."
 msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
-msgid "Release the mouse button to stop rotating."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3138,5 +3138,5 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3712,7 +3712,6 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Încarcă selecţia"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
@@ -3897,5 +3896,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr ""
@@ -5170,5 +5169,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -5587,4 +5586,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5675,5 +5679,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr ""
@@ -5775,14 +5779,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6112,4 +6116,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6122,10 +6132,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6795,145 +6799,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Nume"
@@ -8147,10 +8151,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr ""
@@ -8158,5 +8162,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8170,17 +8173,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "necunoscut"
@@ -8945,11 +8947,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8966,14 +8970,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Strat"
@@ -9508,5 +9512,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr ""
@@ -10559,55 +10563,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11080,5 +11084,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr ""
@@ -11100,16 +11104,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr ""
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11139,12 +11144,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr ""
@@ -14087,6 +14092,7 @@
 msgstr ""
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14177,5 +14183,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14362,5 +14368,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14401,19 +14407,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14421,5 +14427,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14432,10 +14438,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14618,5 +14624,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16434,5 +16440,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr ""
@@ -16484,5 +16490,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17053,4 +17059,20 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+msgid "Type:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17207,4 +17229,16 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+msgid "Delete this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17960,5 +17994,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19228,7 +19262,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19245,5 +19279,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr ""
@@ -19261,4 +19295,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19266,9 +19301,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr ""
@@ -19296,15 +19330,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19315,11 +19343,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr ""
@@ -19339,15 +19366,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19364,11 +19389,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19389,8 +19414,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19408,11 +19433,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr ""
@@ -19432,6 +19457,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19449,11 +19474,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr ""
@@ -19473,6 +19498,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19490,11 +19515,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr ""
@@ -19632,5 +19657,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19639,12 +19664,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19652,13 +19680,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19687,24 +19715,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr ""
@@ -19716,5 +19740,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19728,11 +19752,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19740,10 +19763,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19751,10 +19774,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19762,11 +19785,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19774,10 +19796,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19785,10 +19807,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr ""
@@ -19796,10 +19818,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19807,11 +19829,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19819,10 +19840,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19830,10 +19851,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19841,10 +19862,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19852,10 +19873,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19863,10 +19884,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -19874,10 +19895,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -19885,10 +19906,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -19969,6 +19990,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr ""
@@ -19977,5 +19997,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr ""
@@ -19983,6 +20003,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr ""
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr ""
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr ""
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr ""
@@ -19991,15 +20040,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr ""
@@ -20007,5 +20056,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20047,28 +20096,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr ""
@@ -20081,10 +20129,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20098,10 +20146,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20125,97 +20173,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20230,10 +20278,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr ""
@@ -20249,10 +20297,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr ""
@@ -20267,19 +20315,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr ""
@@ -20287,20 +20335,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20308,5 +20356,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr ""
@@ -20317,5 +20365,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20335,10 +20383,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20360,10 +20408,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20385,10 +20433,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20410,5 +20458,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20423,9 +20471,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20439,9 +20487,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20471,10 +20519,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20504,5 +20552,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20514,10 +20562,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr ""
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20525,39 +20573,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr ""
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr ""
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr ""
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr ""
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr ""
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20566,73 +20585,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr ""
@@ -20641,38 +20628,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr ""
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20681,5 +20698,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20687,5 +20704,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20693,5 +20710,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20709,11 +20726,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr ""
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20721,5 +20738,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20727,5 +20744,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20733,5 +20750,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20740,15 +20757,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
-msgstr ""
-
-#: build/trans_presets.java:600
-msgid "Bikes"
 msgstr ""
 
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr ""
@@ -20758,10 +20771,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr ""
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr ""
@@ -20769,15 +20782,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr ""
@@ -20785,5 +20798,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -20823,17 +20836,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr ""
@@ -20842,5 +20855,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr ""
@@ -20850,5 +20863,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20857,27 +20870,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20885,6 +20898,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20893,11 +20906,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20905,30 +20918,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr ""
@@ -20936,5 +20949,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -20943,14 +20956,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -20958,33 +20971,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -20992,5 +21005,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -20998,5 +21011,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21007,14 +21020,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21024,5 +21037,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr ""
@@ -21030,15 +21043,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
+#: build/trans_presets.java:690
+msgid "Edit City Limit Sign"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Name"
+#: build/trans_presets.java:695
+msgid "Second Name"
+msgstr ""
+
+#. item "Waypoints/City Limit" text "Second Name"
 #: build/trans_presets.java:697
-msgid "Edit City Limit Sign"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
-msgid "Second Name"
-msgstr ""
-
-#. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
 msgid "Speed Camera"
 msgstr ""
@@ -21047,5 +21060,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr ""
@@ -21053,5 +21066,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21059,5 +21072,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21065,5 +21078,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21073,10 +21086,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21084,5 +21097,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr ""
@@ -21090,5 +21103,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr ""
@@ -21100,7 +21113,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr ""
@@ -21108,5 +21121,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr ""
@@ -21114,5 +21127,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr ""
@@ -21120,5 +21133,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21163,16 +21176,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21181,5 +21194,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21187,5 +21200,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -21193,10 +21206,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21204,15 +21217,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr ""
@@ -21220,5 +21233,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr ""
@@ -21226,10 +21239,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21239,5 +21252,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21248,22 +21261,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21271,5 +21284,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21278,5 +21291,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21288,10 +21301,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21299,5 +21312,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr ""
@@ -21305,50 +21318,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21356,25 +21369,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21385,11 +21398,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr ""
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr ""
@@ -21397,5 +21410,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr ""
@@ -21403,5 +21416,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21409,10 +21422,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21420,10 +21433,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr ""
@@ -21431,10 +21444,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr ""
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr ""
@@ -21442,10 +21455,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr ""
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr ""
@@ -21455,5 +21468,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr ""
@@ -21461,15 +21474,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr ""
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr ""
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr ""
@@ -21477,15 +21490,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21493,15 +21506,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21509,5 +21522,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -21516,10 +21529,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21530,14 +21543,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21551,35 +21564,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
 #: build/trans_presets.java:1039
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1041
-msgid "Mud"
-msgstr ""
-
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
 msgid "Beach"
 msgstr ""
@@ -21587,20 +21600,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr ""
@@ -21608,10 +21621,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr ""
@@ -21619,5 +21632,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr ""
@@ -21625,5 +21638,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr ""
@@ -21631,5 +21644,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21638,5 +21651,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21644,10 +21657,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr ""
@@ -21655,5 +21668,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr ""
@@ -21661,5 +21674,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr ""
@@ -21667,15 +21680,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
+#: build/trans_presets.java:1090
+msgid "Edit Dam"
+msgstr ""
+
+#. item "Water/Water/Dam" text "Name"
+#: build/trans_presets.java:1096
+msgid "Waterway Point"
+msgstr ""
+
+#. group "Waterway Point"
 #: build/trans_presets.java:1097
-msgid "Edit Dam"
-msgstr ""
-
-#. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
-msgid "Waterway Point"
-msgstr ""
-
-#. group "Waterway Point"
-#: build/trans_presets.java:1104
 msgid "Lock Gate"
 msgstr ""
@@ -21684,5 +21697,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21690,20 +21703,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr ""
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21712,15 +21725,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr ""
@@ -21728,10 +21741,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr ""
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21739,10 +21752,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21752,20 +21765,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr ""
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr ""
@@ -21773,5 +21786,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr ""
@@ -21801,86 +21814,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21892,8 +21830,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21907,29 +21845,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21942,8 +21880,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22014,8 +21952,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22027,8 +21965,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr ""
@@ -22041,8 +21979,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22055,23 +21993,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr ""
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22079,50 +22017,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr ""
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22130,5 +22068,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22137,10 +22075,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr ""
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr ""
@@ -22149,9 +22087,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr ""
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr ""
@@ -22160,5 +22098,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22167,5 +22105,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22175,5 +22113,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22181,5 +22119,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr ""
@@ -22188,5 +22126,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22195,10 +22133,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr ""
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr ""
@@ -22206,10 +22144,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr ""
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22217,10 +22155,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr ""
@@ -22228,10 +22166,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr ""
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22239,10 +22177,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22251,5 +22189,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22257,5 +22195,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22264,5 +22202,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22270,5 +22208,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr ""
@@ -22278,62 +22216,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr ""
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22391,32 +22329,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr ""
@@ -22475,165 +22413,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22650,5 +22588,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22658,5 +22596,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr ""
@@ -22667,25 +22605,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22694,48 +22632,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
+#: build/trans_presets.java:1362
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1363
+msgid "Spaces for Disabled"
+msgstr ""
+
+#: build/trans_presets.java:1364
+msgid "Spaces for Women"
+msgstr ""
+
+#: build/trans_presets.java:1365
+msgid "Spaces for Parents"
+msgstr ""
+
+#: build/trans_presets.java:1366
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1368
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash"
 #: build/trans_presets.java:1369
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
-msgid "Spaces for Disabled"
-msgstr ""
-
-#: build/trans_presets.java:1371
-msgid "Spaces for Women"
-msgstr ""
-
-#: build/trans_presets.java:1372
-msgid "Spaces for Parents"
-msgstr ""
-
-#: build/trans_presets.java:1373
-msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+msgid "Edit Car Wash"
+msgstr ""
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1374
+msgid "Repair"
+msgstr ""
+
+#. item "Car/Repair"
 #: build/trans_presets.java:1375
-msgid "Wash"
-msgstr ""
-
-#. item "Car/Wash"
-#: build/trans_presets.java:1376
-msgid "Edit Car Wash"
-msgstr ""
-
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
-msgid "Repair"
-msgstr ""
-
-#. item "Car/Repair"
-#: build/trans_presets.java:1382
 msgid "Edit Car Repair"
 msgstr ""
@@ -22743,5 +22681,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr ""
@@ -22750,10 +22688,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr ""
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22761,5 +22699,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22767,10 +22705,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22779,10 +22717,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr ""
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22792,5 +22730,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22798,5 +22736,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22804,5 +22742,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22810,5 +22748,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22816,5 +22754,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22823,5 +22761,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22829,5 +22767,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr ""
@@ -22836,5 +22774,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr ""
@@ -22846,5 +22784,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22852,10 +22790,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr ""
@@ -22864,10 +22802,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr ""
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -22876,5 +22814,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr ""
@@ -22883,5 +22821,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr ""
@@ -22889,5 +22827,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr ""
@@ -22897,5 +22835,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr ""
@@ -22904,6 +22842,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -22911,19 +22849,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr ""
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr ""
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr ""
@@ -22931,5 +22869,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr ""
@@ -22937,5 +22875,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr ""
@@ -22943,10 +22881,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr ""
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22954,5 +22892,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -22960,10 +22898,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -22972,5 +22910,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -22978,5 +22916,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -22984,5 +22922,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -22990,5 +22928,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -22996,5 +22934,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23002,5 +22940,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23010,5 +22948,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23018,5 +22956,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23027,6 +22965,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23036,5 +22974,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23043,5 +22981,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23049,5 +22987,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23055,15 +22993,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr ""
@@ -23075,5 +23013,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -23082,15 +23020,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23098,20 +23036,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23119,10 +23057,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23130,30 +23068,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
@@ -23161,10 +23099,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr ""
@@ -23175,5 +23113,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -23181,5 +23119,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -23187,5 +23125,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23193,73 +23131,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr ""
@@ -23267,17 +23205,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr ""
@@ -23285,9 +23223,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr ""
@@ -23295,18 +23233,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr ""
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23314,9 +23252,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr ""
@@ -23324,24 +23262,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
+#: build/trans_presets.java:1675
+msgid "Edit Nightclub"
+msgstr ""
+
+#: build/trans_presets.java:1681
+msgid "Tourism"
+msgstr ""
+
+#. group "Tourism"
 #: build/trans_presets.java:1682
-msgid "Edit Nightclub"
-msgstr ""
-
+msgid "Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction"
+#: build/trans_presets.java:1683
+msgid "Edit Attraction"
+msgstr ""
+
+#. item "Tourism/Attraction" text "Opening Hours"
 #: build/trans_presets.java:1688
-msgid "Tourism"
-msgstr ""
-
-#. group "Tourism"
-#: build/trans_presets.java:1689
-msgid "Attraction"
-msgstr ""
-
-#. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
-msgid "Edit Attraction"
-msgstr ""
-
-#. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
 msgid "Museum"
 msgstr ""
@@ -23349,9 +23287,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr ""
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr ""
@@ -23360,9 +23298,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr ""
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr ""
@@ -23370,24 +23308,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr ""
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr ""
@@ -23395,5 +23333,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr ""
@@ -23401,19 +23339,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr ""
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23451,5 +23389,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23457,28 +23395,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23488,5 +23426,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23494,5 +23432,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23500,6 +23438,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr ""
@@ -23507,5 +23445,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23513,6 +23451,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr ""
@@ -23520,5 +23458,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23526,46 +23464,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23573,29 +23511,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23603,25 +23541,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
+msgid "Historic Places"
+msgstr ""
+
+#. group "Historic Places"
 #: build/trans_presets.java:1814
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
-msgid "Historic Places"
-msgstr ""
-
-#. group "Historic Places"
-#: build/trans_presets.java:1821
 msgid "Castle"
 msgstr ""
@@ -23630,19 +23568,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr ""
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr ""
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr ""
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr ""
@@ -23651,9 +23589,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr ""
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr ""
@@ -23661,10 +23599,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23672,5 +23610,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23678,15 +23616,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -23694,55 +23632,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
+#: build/trans_presets.java:1869
+msgid "Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone"
+#: build/trans_presets.java:1870
+msgid "Edit Boundary Stone"
+msgstr ""
+
+#. item "Historic Places/Boundary Stone" text "Name"
+#: build/trans_presets.java:1875
+msgid "Leisure"
+msgstr ""
+
+#. group "Leisure"
 #: build/trans_presets.java:1876
-msgid "Boundary Stone"
-msgstr ""
-
-#. item "Historic Places/Boundary Stone"
+msgid "Water Park"
+msgstr ""
+
+#. item "Leisure/Water Park"
 #: build/trans_presets.java:1877
-msgid "Edit Boundary Stone"
-msgstr ""
-
-#. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
-msgid "Leisure"
-msgstr ""
-
-#. group "Leisure"
-#: build/trans_presets.java:1883
-msgid "Water Park"
-msgstr ""
-
-#. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
 msgid "Edit Water Park"
 msgstr ""
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr ""
@@ -23750,35 +23688,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr ""
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr ""
 
 #. item "Leisure/Fishing"
+#: build/trans_presets.java:1888
+msgid "Edit Fishing"
+msgstr ""
+
+#. item "Leisure/Fishing" text "Name"
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
+msgid "Sports"
+msgstr ""
+
+#. group "Sports"
 #: build/trans_presets.java:1895
-msgid "Edit Fishing"
-msgstr ""
-
-#. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
-msgid "Sports"
-msgstr ""
-
-#. group "Sports"
-#: build/trans_presets.java:1902
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr ""
@@ -23792,6 +23730,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr ""
@@ -24183,6 +24121,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24216,225 +24154,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr ""
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr ""
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
+#: build/trans_presets.java:1932
+msgid "Golf Course"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Golf Course"
+#: build/trans_presets.java:1933
+msgid "Edit Golf Course"
+msgstr ""
+
+#: build/trans_presets.java:1938
+msgid "Miniature Golf"
+msgstr ""
+
+#. item "Sports/Sport Facilities/Miniature Golf"
 #: build/trans_presets.java:1939
-msgid "Golf Course"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
-msgid "Edit Golf Course"
+msgid "Edit Miniature Golf"
 msgstr ""
 
 #: build/trans_presets.java:1945
-msgid "Miniature Golf"
-msgstr ""
-
-#. item "Sports/Sport Facilities/Miniature Golf"
+msgid "Sport"
+msgstr ""
+
+#. group "Sport"
 #: build/trans_presets.java:1946
-msgid "Edit Miniature Golf"
-msgstr ""
-
-#: build/trans_presets.java:1952
-msgid "Sport"
-msgstr ""
-
-#. group "Sport"
-#: build/trans_presets.java:1953
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24473,21 +24411,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr ""
@@ -24526,203 +24464,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
+msgid "Edit Athletics"
+msgstr ""
+
+#: build/trans_presets.java:1964
+msgid "Archery"
+msgstr ""
+
+#. item "Sport/Archery"
 #: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
-msgid "Edit Athletics"
-msgstr ""
-
+msgid "Edit Archery"
+msgstr ""
+
+#: build/trans_presets.java:1970
+msgid "Climbing"
+msgstr ""
+
+#. item "Sport/Climbing"
 #: build/trans_presets.java:1971
-msgid "Archery"
-msgstr ""
-
-#. item "Sport/Archery"
-#: build/trans_presets.java:1972
-msgid "Edit Archery"
-msgstr ""
-
+msgid "Edit Climbing"
+msgstr ""
+
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
 #: build/trans_presets.java:1977
-msgid "Climbing"
-msgstr ""
-
-#. item "Sport/Climbing"
-#: build/trans_presets.java:1978
-msgid "Edit Climbing"
-msgstr ""
-
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr ""
 
+#: build/trans_presets.java:1988
+msgid "Dog Racing"
+msgstr ""
+
+#. item "Sport/Dog Racing"
+#: build/trans_presets.java:1989
+msgid "Edit Dog Racing"
+msgstr ""
+
+#: build/trans_presets.java:1994
+msgid "Equestrian"
+msgstr ""
+
+#. item "Sport/Equestrian"
 #: build/trans_presets.java:1995
-msgid "Dog Racing"
-msgstr ""
-
-#. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
-msgid "Edit Dog Racing"
-msgstr ""
-
+msgid "Edit Equestrian"
+msgstr ""
+
+#: build/trans_presets.java:2000
+msgid "Horse Racing"
+msgstr ""
+
+#. item "Sport/Horse Racing"
 #: build/trans_presets.java:2001
-msgid "Equestrian"
-msgstr ""
-
-#. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
-msgid "Edit Equestrian"
-msgstr ""
-
+msgid "Edit Horse Racing"
+msgstr ""
+
+#: build/trans_presets.java:2006
+msgid "Gymnastics"
+msgstr ""
+
+#. item "Sport/Gymnastics"
 #: build/trans_presets.java:2007
-msgid "Horse Racing"
-msgstr ""
-
-#. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
-msgid "Edit Horse Racing"
-msgstr ""
-
+msgid "Edit Gymnastics"
+msgstr ""
+
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
 #: build/trans_presets.java:2013
-msgid "Gymnastics"
-msgstr ""
-
-#. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
-msgid "Edit Gymnastics"
-msgstr ""
-
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
 #: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
-msgid "Edit Motor Sports"
-msgstr ""
-
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
+msgid "Edit Skateboard"
+msgstr ""
+
+#: build/trans_presets.java:2030
+msgid "Swimming"
+msgstr ""
+
+#. item "Sport/Swimming"
 #: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
-msgid "Edit Skateboard"
-msgstr ""
-
-#: build/trans_presets.java:2037
-msgid "Swimming"
-msgstr ""
-
-#. item "Sport/Swimming"
-#: build/trans_presets.java:2038
 msgid "Edit Swimming"
 msgstr ""
@@ -24730,52 +24668,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
+#: build/trans_presets.java:2038
+msgid "Edit Skiing"
+msgstr ""
+
+#. item "Sport/Skiing" text "Name"
+#: build/trans_presets.java:2041
+msgid "Piste type"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Piste type"
+#: build/trans_presets.java:2041
+msgid "downhill"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "nordic"
+msgstr ""
+
+#: build/trans_presets.java:2041
+msgid "snow_park"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "Difficulty"
+msgstr ""
+
+#. item "Sport/Skiing" combo "Difficulty"
+#: build/trans_presets.java:2042
+msgid "novice"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "easy"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "advanced"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "expert"
+msgstr ""
+
+#: build/trans_presets.java:2042
+msgid "freeride"
+msgstr ""
+
 #: build/trans_presets.java:2045
-msgid "Edit Skiing"
-msgstr ""
-
-#. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
-msgid "Piste type"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
-msgid "downhill"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "nordic"
-msgstr ""
-
-#: build/trans_presets.java:2048
-msgid "snow_park"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "Difficulty"
-msgstr ""
-
-#. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
-msgid "novice"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "easy"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "advanced"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "expert"
-msgstr ""
-
-#: build/trans_presets.java:2049
-msgid "freeride"
-msgstr ""
-
-#: build/trans_presets.java:2052
 msgid "Shooting"
 msgstr ""
@@ -24783,177 +24721,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
+#: build/trans_presets.java:2047
+msgid "Edit Shooting"
+msgstr ""
+
+#: build/trans_presets.java:2053
+msgid "Sport (Ball)"
+msgstr ""
+
+#. group "Sport (Ball)"
 #: build/trans_presets.java:2054
-msgid "Edit Shooting"
+msgid "Soccer"
+msgstr ""
+
+#. item "Sport (Ball)/Soccer"
+#: build/trans_presets.java:2055
+msgid "Edit Soccer"
 msgstr ""
 
 #: build/trans_presets.java:2060
-msgid "Sport (Ball)"
-msgstr ""
-
-#. group "Sport (Ball)"
+msgid "Football"
+msgstr ""
+
+#. item "Sport (Ball)/Football"
 #: build/trans_presets.java:2061
-msgid "Soccer"
-msgstr ""
-
-#. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
-msgid "Edit Soccer"
-msgstr ""
-
+msgid "Edit Football"
+msgstr ""
+
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2067
-msgid "Football"
-msgstr ""
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
-msgid "Edit Football"
-msgstr ""
-
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2072
+msgid "Baseball"
+msgstr ""
+
+#. item "Sport (Ball)/Baseball"
 #: build/trans_presets.java:2073
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
-msgid "Edit Australian Football"
-msgstr ""
-
+msgid "Edit Baseball"
+msgstr ""
+
+#: build/trans_presets.java:2078
+msgid "Basketball"
+msgstr ""
+
+#. item "Sport (Ball)/Basketball"
 #: build/trans_presets.java:2079
-msgid "Baseball"
-msgstr ""
-
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
-msgid "Edit Baseball"
-msgstr ""
-
+msgid "Edit Basketball"
+msgstr ""
+
+#: build/trans_presets.java:2084
+msgid "Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf"
 #: build/trans_presets.java:2085
-msgid "Basketball"
-msgstr ""
-
-#. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
-msgid "Edit Basketball"
-msgstr ""
-
+msgid "Edit Golf"
+msgstr ""
+
+#. item "Sport (Ball)/Golf" combo "type"
+#: build/trans_presets.java:2088
+msgid "golf_course"
+msgstr ""
+
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
 #: build/trans_presets.java:2091
-msgid "Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
-msgid "Edit Golf"
-msgstr ""
-
-#. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
-msgid "golf_course"
-msgstr ""
-
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
+msgid "Edit Croquet"
+msgstr ""
+
+#: build/trans_presets.java:2120
+msgid "Hockey"
+msgstr ""
+
+#. item "Sport (Ball)/Hockey"
 #: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
-msgid "Edit Croquet"
-msgstr ""
-
+msgid "Edit Hockey"
+msgstr ""
+
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
 #: build/trans_presets.java:2127
-msgid "Hockey"
-msgstr ""
-
-#. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
-msgid "Edit Hockey"
-msgstr ""
-
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
-msgid "Edit Racquet"
-msgstr ""
-
+msgid "Edit Rugby"
+msgstr ""
+
+#: build/trans_presets.java:2144
+msgid "Table Tennis"
+msgstr ""
+
+#. item "Sport (Ball)/Table Tennis"
 #: build/trans_presets.java:2145
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
-msgid "Edit Rugby"
-msgstr ""
-
+msgid "Edit Table Tennis"
+msgstr ""
+
+#: build/trans_presets.java:2150
+msgid "Tennis"
+msgstr ""
+
+#. item "Sport (Ball)/Tennis"
 #: build/trans_presets.java:2151
-msgid "Table Tennis"
-msgstr ""
-
-#. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
-msgid "Edit Table Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2157
-msgid "Tennis"
-msgstr ""
-
-#. item "Sport (Ball)/Tennis"
+msgid "Edit Tennis"
+msgstr ""
+
 #: build/trans_presets.java:2158
-msgid "Edit Tennis"
-msgstr ""
-
-#: build/trans_presets.java:2165
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr ""
@@ -24961,5 +24899,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr ""
@@ -24967,10 +24905,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr ""
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr ""
@@ -24978,10 +24916,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr ""
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr ""
@@ -24989,10 +24927,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr ""
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr ""
@@ -25001,10 +24939,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr ""
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr ""
@@ -25013,10 +24951,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr ""
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr ""
@@ -25026,10 +24964,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr ""
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr ""
@@ -25038,10 +24976,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr ""
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr ""
@@ -25049,5 +24987,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr ""
@@ -25055,15 +24993,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr ""
@@ -25071,10 +25009,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr ""
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -25082,10 +25020,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -25093,5 +25031,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -25099,5 +25037,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr ""
@@ -25106,10 +25044,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr ""
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr ""
@@ -25118,9 +25056,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr ""
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -25128,10 +25066,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr ""
@@ -25140,10 +25078,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr ""
@@ -25153,5 +25091,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr ""
@@ -25160,6 +25098,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr ""
@@ -25168,66 +25106,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25236,81 +25174,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr ""
@@ -25319,5 +25257,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr ""
@@ -25325,5 +25263,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -25331,25 +25269,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -25358,5 +25296,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25364,61 +25302,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
+#: build/trans_presets.java:2304
+msgid "Man Made"
+msgstr ""
+
+#. group "Man Made"
+#: build/trans_presets.java:2305
+msgid "Works"
+msgstr ""
+
+#. item "Man Made/Works"
+#: build/trans_presets.java:2306
+msgid "Edit Works"
+msgstr ""
+
+#. item "Man Made/Works" text "Name"
+#: build/trans_presets.java:2310
+msgid "Tower"
+msgstr ""
+
+#. item "Man Made/Tower"
 #: build/trans_presets.java:2311
-msgid "Man Made"
-msgstr ""
-
-#. group "Man Made"
-#: build/trans_presets.java:2312
-msgid "Works"
-msgstr ""
-
-#. item "Man Made/Works"
-#: build/trans_presets.java:2313
-msgid "Edit Works"
-msgstr ""
-
-#. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
-msgid "Tower"
-msgstr ""
-
-#. item "Man Made/Tower"
-#: build/trans_presets.java:2318
 msgid "Edit Tower"
 msgstr ""
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25426,25 +25364,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr ""
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr ""
@@ -25452,10 +25390,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr ""
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr ""
@@ -25463,10 +25401,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr ""
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr ""
@@ -25475,41 +25413,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr ""
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr ""
@@ -25519,10 +25457,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr ""
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr ""
@@ -25530,5 +25468,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr ""
@@ -25536,10 +25474,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr ""
@@ -25547,10 +25485,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr ""
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr ""
@@ -25558,23 +25496,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr ""
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr ""
@@ -25584,35 +25522,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr ""
@@ -25621,10 +25559,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr ""
@@ -25633,5 +25571,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -25639,10 +25577,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr ""
@@ -25653,23 +25591,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr ""
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr ""
@@ -25678,74 +25616,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+#: build/trans_presets.java:2423
+msgid "Edit Power Line"
+msgstr ""
+
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2424
+msgid "Line type"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2424
+msgid "line"
+msgstr ""
+
+#: build/trans_presets.java:2424
+msgid "minor_line"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2429
+msgid "Amount of Cables"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Cables"
 #: build/trans_presets.java:2430
-msgid "Edit Power Line"
-msgstr ""
-
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
-msgid "Line type"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
-msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2431
-msgid "minor_line"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
-msgid "Amount of Cables"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
+#: build/trans_presets.java:2434
+msgid "Toilets"
+msgstr ""
+
 #: build/trans_presets.java:2441
-msgid "Toilets"
-msgstr ""
-
-#: build/trans_presets.java:2448
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr ""
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr ""
@@ -25754,5 +25692,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr ""
@@ -25760,5 +25698,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr ""
@@ -25766,5 +25704,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr ""
@@ -25772,5 +25710,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25778,5 +25716,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -25784,15 +25722,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr ""
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr ""
@@ -25801,5 +25739,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr ""
@@ -25807,35 +25745,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2467
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2470
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2474
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
 msgid "Waste Basket"
 msgstr ""
@@ -25843,5 +25781,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25850,31 +25788,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -25953,5 +25891,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -25961,31 +25899,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -25994,30 +25932,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr ""
@@ -26026,10 +25964,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr ""
@@ -26038,10 +25976,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr ""
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26050,5 +25988,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26056,5 +25994,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26062,15 +26000,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
+#: build/trans_presets.java:2517
+msgid "Edit Baby Hatch"
+msgstr ""
+
+#. item "Amenities/Baby Hatch" text "Opening Hours"
+#: build/trans_presets.java:2523
+msgid "Shops"
+msgstr ""
+
+#. group "Shops"
 #: build/trans_presets.java:2524
-msgid "Edit Baby Hatch"
-msgstr ""
-
-#. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
-msgid "Shops"
-msgstr ""
-
-#. group "Shops"
-#: build/trans_presets.java:2531
 msgid "Car Dealer"
 msgstr ""
@@ -26078,10 +26016,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26090,28 +26028,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr ""
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
 #: build/trans_presets.java:2545
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2551
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2552
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26119,9 +26057,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr ""
@@ -26129,27 +26067,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr ""
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr ""
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
+msgid "Edit Butcher"
 msgstr ""
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr ""
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr ""
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr ""
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr ""
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr ""
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr ""
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr ""
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr ""
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr ""
@@ -26157,5 +26309,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr ""
@@ -26163,306 +26315,97 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr ""
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+msgid "bicycle_tube"
+msgstr ""
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr ""
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr ""
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr ""
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr ""
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr ""
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr ""
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr ""
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr ""
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr ""
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr ""
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr ""
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr ""
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr ""
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr ""
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr ""
@@ -26470,14 +26413,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
+#: build/trans_presets.java:2744
+msgid "Edit Bank"
+msgstr ""
+
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
+msgid "Automated Teller Machine"
+msgstr ""
+
+#. item "Cash/Bank" check "Automated Teller Machine"
 #: build/trans_presets.java:2751
-msgid "Edit Bank"
-msgstr ""
-
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
-msgid "Automated Teller Machine"
-msgstr ""
-
-#. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
 msgid "Money Exchange"
 msgstr ""
@@ -26485,5 +26428,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr ""
@@ -26491,15 +26434,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr ""
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr ""
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr ""
@@ -26507,18 +26450,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr ""
@@ -26526,5 +26469,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr ""
@@ -26532,9 +26475,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr ""
@@ -26542,10 +26485,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr ""
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26554,5 +26497,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26561,20 +26504,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26582,5 +26525,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr ""
@@ -26589,64 +26532,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+#: build/trans_presets.java:2809
+msgid "Edit Veterinary"
+msgstr ""
+
 #: build/trans_presets.java:2816
-msgid "Edit Veterinary"
-msgstr ""
-
-#: build/trans_presets.java:2823
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
+#: build/trans_presets.java:2817
+msgid "Places"
+msgstr ""
+
+#. group "Geography/Places"
+#: build/trans_presets.java:2818
+msgid "Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2819
+msgid "Edit Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent" text "Name"
 #: build/trans_presets.java:2824
-msgid "Places"
-msgstr ""
-
-#. group "Geography/Places"
+msgid "Country"
+msgstr ""
+
+#. item "Geography/Places/Country"
 #: build/trans_presets.java:2825
-msgid "Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
-msgid "Edit Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent" text "Name"
+msgid "Edit Country"
+msgstr ""
+
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2830
+msgid "State"
+msgstr ""
+
+#. item "Geography/Places/State"
 #: build/trans_presets.java:2831
-msgid "Country"
-msgstr ""
-
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
-msgid "Edit Country"
-msgstr ""
-
-#. item "Geography/Places/Country" text "Name"
+msgid "Edit State"
+msgstr ""
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2836
+msgid "Region"
+msgstr ""
+
+#. item "Geography/Places/Region"
 #: build/trans_presets.java:2837
-msgid "State"
-msgstr ""
-
-#. item "Geography/Places/State"
-#: build/trans_presets.java:2838
-msgid "Edit State"
-msgstr ""
-
-#. item "Geography/Places/State" text "Name"
+msgid "Edit Region"
+msgstr ""
+
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2842
+msgid "County"
+msgstr ""
+
+#. item "Geography/Places/County"
 #: build/trans_presets.java:2843
-msgid "Region"
-msgstr ""
-
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
-msgid "Edit Region"
-msgstr ""
-
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
-msgid "County"
-msgstr ""
-
-#. item "Geography/Places/County"
-#: build/trans_presets.java:2850
 msgid "Edit County"
 msgstr ""
@@ -26654,15 +26597,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr ""
@@ -26670,10 +26613,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr ""
@@ -26681,25 +26624,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
+#: build/trans_presets.java:2869
+msgid "Village"
+msgstr ""
+
+#. item "Geography/Places/Village"
+#: build/trans_presets.java:2870
+msgid "Edit Village"
+msgstr ""
+
+#. item "Geography/Places/Village" text "Name"
+#: build/trans_presets.java:2875
+msgid "Hamlet"
+msgstr ""
+
+#. item "Geography/Places/Hamlet"
 #: build/trans_presets.java:2876
-msgid "Village"
-msgstr ""
-
-#. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
-msgid "Edit Village"
-msgstr ""
-
-#. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
-msgid "Hamlet"
-msgstr ""
-
-#. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
 msgid "Edit Hamlet"
 msgstr ""
@@ -26707,5 +26650,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26713,10 +26656,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr ""
@@ -26724,10 +26667,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr ""
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26735,5 +26678,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26741,5 +26684,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr ""
@@ -26747,10 +26690,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr ""
@@ -26758,10 +26701,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr ""
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr ""
@@ -26769,10 +26712,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr ""
@@ -26780,70 +26723,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
+#: build/trans_presets.java:2926
+msgid "Edit Volcano"
+msgstr ""
+
+#. item "Geography/Places/Volcano" text "Elevation"
+#: build/trans_presets.java:2932
+msgid "Boundaries"
+msgstr ""
+
+#. group "Boundaries"
 #: build/trans_presets.java:2933
-msgid "Edit Volcano"
-msgstr ""
-
-#. item "Geography/Places/Volcano" text "Elevation"
+msgid "National"
+msgstr ""
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2934
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Boundaries/National" text "Name"
 #: build/trans_presets.java:2939
-msgid "Boundaries"
-msgstr ""
-
-#. group "Boundaries"
+msgid "Administrative"
+msgstr ""
+
+#. item "Boundaries/Administrative"
 #: build/trans_presets.java:2940
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:2941
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
 #: build/trans_presets.java:2946
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2957
+msgid "National park"
+msgstr ""
+
+#. item "Boundaries/National park"
 #: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Boundaries/National park" text "Name"
 #: build/trans_presets.java:2964
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
+msgid "Land use"
+msgstr ""
+
+#. group "Land use"
 #: build/trans_presets.java:2965
-msgid "Edit National Park Boundary"
-msgstr ""
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
-msgid "Land use"
-msgstr ""
-
-#. group "Land use"
-#: build/trans_presets.java:2972
 msgid "Tree"
 msgstr ""
@@ -26852,15 +26795,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
+#: build/trans_presets.java:2968
+msgid "Edit Tree"
+msgstr ""
+
+#. item "Land use/Tree" text "Height"
+#: build/trans_presets.java:2973
+msgid "Botanical Name"
+msgstr ""
+
+#. item "Land use/Tree" text "Botanical Name"
 #: build/trans_presets.java:2975
-msgid "Edit Tree"
-msgstr ""
-
-#. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
-msgid "Botanical Name"
-msgstr ""
-
-#. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
 msgid "Wood"
 msgstr ""
@@ -26869,5 +26812,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr ""
@@ -26875,17 +26818,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr ""
@@ -26894,14 +26837,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
+#: build/trans_presets.java:2986
+msgid "Edit Forest Landuse"
+msgstr ""
+
+#: build/trans_presets.java:2992
+msgid "Nature Reserve"
+msgstr ""
+
+#. item "Land use/Nature Reserve"
 #: build/trans_presets.java:2993
-msgid "Edit Forest Landuse"
-msgstr ""
-
-#: build/trans_presets.java:2999
-msgid "Nature Reserve"
-msgstr ""
-
-#. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
 msgid "Edit Nature Reserve"
 msgstr ""
@@ -26909,25 +26852,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -26935,10 +26878,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -26946,5 +26889,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -26952,5 +26895,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -26959,45 +26902,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr ""
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr ""
+
+#. item "Land use/Meadow"
 #: build/trans_presets.java:3036
-msgid "Farmland"
-msgstr ""
-
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3037
-msgid "Edit Farmland Landuse"
-msgstr ""
-
-#. item "Land use/Farmland" text "Name"
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3041
+msgid "Vineyard"
+msgstr ""
+
+#. item "Land use/Vineyard"
 #: build/trans_presets.java:3042
-msgid "Meadow"
-msgstr ""
-
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3043
-msgid "Edit Meadow Landuse"
-msgstr ""
-
-#. item "Land use/Meadow" text "Name"
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3047
+msgid "Allotments"
+msgstr ""
+
+#. item "Land use/Allotments"
 #: build/trans_presets.java:3048
-msgid "Vineyard"
-msgstr ""
-
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
-msgid "Edit Vineyard Landuse"
-msgstr ""
-
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
-msgid "Allotments"
-msgstr ""
-
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3055
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27005,25 +26948,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27031,10 +26974,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27042,20 +26985,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27063,5 +27006,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27069,15 +27012,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr ""
@@ -27085,9 +27028,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr ""
@@ -27095,39 +27038,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
 #: build/trans_presets.java:3114
-msgid "Edit Cemetery Landuse"
-msgstr ""
-
+msgid "Retail"
+msgstr ""
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
 #: build/trans_presets.java:3121
-msgid "Retail"
-msgstr ""
-
-#. item "Land use/Retail"
-#: build/trans_presets.java:3122
-msgid "Edit Retail Landuse"
-msgstr ""
-
-#. item "Land use/Retail" text "Name"
+msgid "Edit Commercial Landuse"
+msgstr ""
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:3126
+msgid "Industrial"
+msgstr ""
+
+#. item "Land use/Industrial"
 #: build/trans_presets.java:3127
-msgid "Commercial"
-msgstr ""
-
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3128
-msgid "Edit Commercial Landuse"
-msgstr ""
-
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
-msgid "Industrial"
-msgstr ""
-
-#. item "Land use/Industrial"
-#: build/trans_presets.java:3134
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27135,15 +27078,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27151,50 +27094,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
+#: build/trans_presets.java:3146
+msgid "Construction area"
+msgstr ""
+
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3147
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
 #: build/trans_presets.java:3153
-msgid "Construction area"
-msgstr ""
-
-#. item "Land use/Construction area"
-#: build/trans_presets.java:3154
-msgid "Edit Construction Landuse"
-msgstr ""
-
-#. item "Land use/Construction area" text "Name"
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3170
+msgid "Quarry"
+msgstr ""
+
+#. item "Land use/Quarry"
 #: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
-msgid "Edit Landfill Landuse"
-msgstr ""
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
-msgid "Quarry"
-msgstr ""
-
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3178
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27204,5 +27147,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27211,10 +27154,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27222,5 +27165,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27229,5 +27172,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27235,34 +27178,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27271,15 +27214,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27287,5 +27230,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27294,5 +27237,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27300,5 +27243,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27389,5 +27332,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27397,17 +27340,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27467,5 +27410,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27474,9 +27417,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27490,10 +27433,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27501,31 +27444,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27534,31 +27477,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/ru.po
===================================================================
--- /applications/editors/josm/i18n/po/ru.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/ru.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-07 06:42+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-19 19:21+0000\n"
 "Last-Translator: Calibrator <Unknown>\n"
 "Language-Team: Koptev Oleg <koptev.oleg@gmail.com>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "X-Poedit-Country: RUSSIAN FEDERATION\n"
@@ -69,5 +69,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1214,5 +1214,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Невозможно переместить объекты за пределы мира."
@@ -1553,5 +1553,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2341,9 +2341,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2428,28 +2428,28 @@
 msgstr "Закончено вычерчивание"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Выдавливание"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr ""
 "Создание прямоугольников из отрезка и \"выдавливание\" линий из полигонов"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Выдавить линию"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 "Переместите сегмент вдоль его перпендикуляра, затем отпустите кнопку мыши."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Нарисуйте прямоугольник желаемых размеров, и отпустите кнопку мыши."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2472,6 +2472,6 @@
 "этой точке"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2483,9 +2483,9 @@
 msgstr "Выбор"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Выбирать, двигать и вращать объекты"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2495,17 +2495,17 @@
 msgstr[2] "Добавьте или переместите новую виртуальную точку на {0} линий"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Переместить элементы"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Переместить"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Отмена перемещения"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2518,9 +2518,9 @@
 "часто производится по ошибке. Действительно переместить их?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Отпустите кнопку мыши, чтобы выделить объекты в прямоугольнике."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2529,9 +2529,9 @@
 "объединения с ближайшей точкой."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Отпустите кнопку мыши, чтобы прекратить вращение."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3314,5 +3314,5 @@
 msgstr "Применить?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3721,19 +3721,19 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:265
 msgid "<h2>Filter active</h2>"
-msgstr ""
+msgstr "<h2>Фильтр активен</h2>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:271
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
+msgstr "<p><b>{0}</b> объектов скрыто"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:279
 #, java-format
 msgid "<b>{0}</b> objects disabled"
-msgstr ""
+msgstr "<b>{0}</b> объектов повреждено"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:282
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
-msgstr ""
+msgstr "</p><p>Закрыть диалог фильтра, чтобы увидеть все объекты.<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:463
@@ -3930,17 +3930,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "стандарт"
+msgstr "Точка: стандартная"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "соединяющий"
+msgstr "Точка: соединение"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "помеченные тегами"
+msgstr "Точка: тегированная"
 
 #. teal
@@ -4124,5 +4121,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "железная дорога"
@@ -5491,5 +5488,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "все"
@@ -5936,4 +5933,9 @@
 msgstr "Режим фильтра"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -6024,5 +6026,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Отношения"
@@ -6124,9 +6126,9 @@
 msgstr "Выбор: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Отсоединить панель"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6135,5 +6137,5 @@
 "панели."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Нажимте для уменьшения/увеличения содержимого панели"
@@ -6478,4 +6480,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6488,10 +6496,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7161,145 +7163,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Название"
@@ -8627,10 +8629,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Тип"
@@ -8638,5 +8640,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8650,17 +8651,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "неизвестно"
@@ -9543,11 +9543,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9564,14 +9566,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Слой"
@@ -10179,5 +10181,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Описание"
@@ -11354,26 +11356,26 @@
 msgstr "Закрыть диалог и принять маркер доступа"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Предупреждение: из-за сбоя отменён запуск операции OAuth"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Восстановление маркера запроса OAuth от ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Восстановление маркера доступа OAuth от ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "Вебсайт OSM кукис сессии в ответе на ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11382,29 +11384,29 @@
 "пользователя с OAuth"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Не удалось выполнить запрос OAuth-авторизации ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Авторизация маркера запроса OAuth ''{0}'' на вебсайте OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Инициализация сеанса на веб-сайте OSM..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Сеанс аутентификации личности для пользователя ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Авторизация маркера запроса ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11938,5 +11940,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Автомобиль"
@@ -11958,16 +11960,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Вело"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11997,12 +12000,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Пешком"
@@ -12745,17 +12748,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Расширенные настройки OAuth"
+msgstr "Параметры действия"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Улица"
+msgstr "Имя параметра"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Измеренные значения"
+msgstr "Значение параметра"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -15304,6 +15304,7 @@
 msgstr "Загрузка треков на сервер"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Видимость"
@@ -15394,5 +15395,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Интерполяция адресов"
@@ -15583,5 +15584,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Создать здание"
@@ -15622,19 +15623,19 @@
 msgstr "Задайте ширину здания"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr "Захватить здание"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Развернуть здание по нажатию (только вектор изображения)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Здания"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15644,5 +15645,5 @@
 "Слой зданий и слой данных OSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15658,10 +15659,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Выбрать Feuille (слой??)"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15705,7 +15706,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert зона 4 кэш файл (.4)"
+msgstr "Файл кэша Reunion RGR92 (.UTM4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15857,5 +15857,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17753,5 +17753,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Общественный транспорт"
@@ -17803,5 +17803,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Точки на дорогах"
@@ -18369,5 +18369,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:90
 msgid "Create/Edit turn restriction..."
-msgstr "Создать / изменить ограничения движения..."
+msgstr "Создать / изменить ограничение на поворот..."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:92
@@ -18390,4 +18390,23 @@
 "В следующей таблице вы можете редактировать <strong>участников построчно</"
 "strong>, внутри отношения OSM, определяющего данное ограничение на поворот."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Тип"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "От:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+#, fuzzy
+msgid "To:"
+msgstr "Куда:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
@@ -18428,5 +18447,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:134
 msgid "Edit basic attributes of a turn restriction"
-msgstr "Править основные атрибуты ограничения движения"
+msgstr "Править основные атрибуты ограничения на поворот"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:138
@@ -18575,4 +18594,18 @@
 msgstr "Уже участвуют в конфликте"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Удалить из ограничения на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Удалить из ограничения на поворот"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -19398,5 +19431,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Мультиполигон"
@@ -20776,7 +20809,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Обозначение"
@@ -20793,5 +20826,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Полосы"
@@ -20809,4 +20842,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20814,9 +20848,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Макс. скорость (км/ч)"
@@ -20844,15 +20877,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20863,11 +20890,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Односторонняя"
@@ -20887,15 +20913,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20912,11 +20936,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20937,8 +20961,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20956,11 +20980,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Тоннель"
@@ -20980,6 +21004,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20997,11 +21021,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Выемка"
@@ -21021,6 +21045,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -21038,11 +21062,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Набережная"
@@ -21180,5 +21204,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr "Проезжаемые места"
@@ -21187,12 +21211,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -21200,13 +21227,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Ширина (метры)"
@@ -21235,24 +21262,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Дорожное покрытие"
@@ -21264,5 +21287,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -21276,11 +21299,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "асфальтированная"
@@ -21288,10 +21310,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "неасфальтированная"
@@ -21299,10 +21321,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "асфальт"
@@ -21310,11 +21332,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "бетон"
@@ -21322,10 +21343,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "металл"
@@ -21333,10 +21354,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "древесина"
@@ -21344,10 +21365,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "дорожные_камни"
@@ -21355,11 +21376,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "мостовая"
@@ -21367,10 +21387,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "гравий"
@@ -21378,10 +21398,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "pebblestone"
@@ -21389,10 +21409,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "сжато"
@@ -21400,10 +21420,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "grass_paver"
@@ -21411,10 +21431,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "трава"
@@ -21422,10 +21442,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "песок"
@@ -21433,10 +21453,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "грунт"
@@ -21517,6 +21537,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Дорога (тип неизвестен)"
@@ -21525,5 +21544,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Свойства дороги неизвестного типа"
@@ -21531,6 +21550,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Строительство"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Свойства ремонтируемой дороги"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Перекрёсток"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "Круг"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Дорожные ограничения"
@@ -21539,15 +21587,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Правка дорожных ограничений"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Платная"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Тупик"
@@ -21555,5 +21603,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Доступ"
@@ -21595,28 +21643,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "да"
@@ -21629,10 +21676,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21646,10 +21693,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21673,97 +21720,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "разрешено владельцем"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "сельскохозяйственное"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr "лесничество"
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr "доставка"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "нет"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr "Земли сельскохозяйственного назначения"
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "осн. предназначение"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr "официальное"
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Грузовик (до 3.5т)"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Грузовик (более 3.5т)"
@@ -21778,10 +21825,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Лошадь"
@@ -21797,10 +21844,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Мотоцикл"
@@ -21815,19 +21862,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Автомобиль"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Общественный транспорт"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Мин. скорость (в км/ч)"
@@ -21835,20 +21882,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Макс. масса (в тоннах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Макс. высота (в метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Макс. ширина (в метрах)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Макс. Длина (метры)"
@@ -21856,5 +21903,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Круг"
@@ -21865,5 +21912,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Свойства перекрёстка"
@@ -21883,10 +21930,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "проезжая часть"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "съезд с дороги"
@@ -21908,10 +21955,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "автострада"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "cъезд с автострады"
@@ -21933,10 +21980,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "главная дорога"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "съезд с основной дороги"
@@ -21958,5 +22005,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21971,9 +22018,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "дорога третьего порядка"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "неклассифицированная дорога"
@@ -21987,9 +22034,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "дорога местного значения"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "жилая улица"
@@ -22019,10 +22066,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "служебный проезд"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "автобусный рельс"
@@ -22052,5 +22099,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -22062,10 +22109,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Спойства моста"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Свойства тоннеля"
@@ -22073,39 +22120,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Пути"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Строительство"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Свойства ремонтируемой дороги"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Перекрёсток"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "Круг"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Грунтовка"
@@ -22114,73 +22132,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Свойства грунтовки"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr "Дорожное покрытие"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr "тип1"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr "тип2"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr "тип3"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr "тип4"
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr "тип5"
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
 msgstr "Шкала MTB"
 
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr "Шкала SAC"
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "туристический"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr "горный_туризм"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr "горный_туризм_по_разрешению"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr "альпинизм"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr "альпинизм_по_разрешению"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr "сложный_альпинизм"
-
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Тропа"
@@ -22189,38 +22175,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Свойства тропы"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "Шкала SAC"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "туристический"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "горный_туризм"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "горный_туризм_по_разрешению"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "альпинизм"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "альпинизм_по_разрешению"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "сложный_альпинизм"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "превосходное"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "хорошее"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "средний"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "плохое"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr "ужасное"
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr "Инвалидные коляски"
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Лыжи"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Снегоход"
@@ -22229,5 +22245,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr "Дорога для верховой езды"
@@ -22235,5 +22251,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Свойства дороги для верховой езды"
@@ -22241,5 +22257,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr "Велодорожка"
@@ -22257,11 +22273,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Свойства велодорожки"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Пешеходы"
@@ -22269,5 +22285,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr "Разделённые пешеходная и велодорожка"
@@ -22275,5 +22291,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr "Совмещённые пешеходная и велодорожка"
@@ -22281,5 +22297,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr "Пешеходная дорожка"
@@ -22288,15 +22304,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Свойства пешеходной дорожки"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Велосипеды"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Лестница"
@@ -22306,10 +22318,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Свойства лестницы"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Магистральная развязка"
@@ -22317,15 +22329,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Свойства магистральной развязки"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Номер"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Придорожный сервис"
@@ -22333,5 +22345,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Свойства придорожного сервиса"
@@ -22371,17 +22383,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Оператор"
@@ -22390,5 +22402,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Светофор"
@@ -22398,5 +22410,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Тип пешеходного перехода"
@@ -22405,27 +22417,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "нерегулируемый"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "регулируемый"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "остров"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "необозначенный"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Разрешён переезд на лошади"
@@ -22433,6 +22445,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Разрешён переезд на велосипеде"
@@ -22441,11 +22453,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Под наблюдением постового"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Название перехода (Великобритания)"
@@ -22453,30 +22465,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra (нерегулируемый)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelican (со светофором)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan (вело-пешеходный со светофором)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin (со светофором с кнопкой)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus (для верховой езды)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger (нерегулируемый вело-пешеходный)"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Стоп"
@@ -22484,5 +22496,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Пешеходный переход"
@@ -22491,14 +22503,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Свойства перекрёстка"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Имя типа (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr "Приспособление для ограничения скорости"
@@ -22506,33 +22518,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr "Редактировать приспособление для ограничения скорости"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr "лежачий полицейский"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr "шикана"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr "сужение"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr "лежачий полицейский с разрывами"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr "широкий лежачий полицейский"
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr "стол"
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr "Место разъезда"
@@ -22540,5 +22552,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr "Свойства места разъезда"
@@ -22546,5 +22558,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Мини-круг"
@@ -22555,14 +22567,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Направление"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "по часовой стрелке"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Разворотный круг"
@@ -22572,5 +22584,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Граница населённого пункта"
@@ -22578,15 +22590,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Свойства границы населённого пункта"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Второе название"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Камера-скоростемер"
@@ -22595,5 +22607,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Телефон экстренного вызова"
@@ -22601,5 +22613,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Уклон"
@@ -22607,5 +22619,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Крутой уклон"
@@ -22613,5 +22625,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr "Контейнер с песком (щебнем)"
@@ -22621,10 +22633,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Брод"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Свойства брода"
@@ -22632,5 +22644,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Перевал"
@@ -22638,5 +22650,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "свойства перевала"
@@ -22648,7 +22660,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Высота над уровнем моря"
@@ -22656,5 +22668,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Преграды"
@@ -22662,5 +22674,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Столбик"
@@ -22668,5 +22680,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Свойства столбика"
@@ -22711,16 +22723,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Разрешено движение:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Преграда для велосипедов"
@@ -22729,5 +22741,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Бетонный блок"
@@ -22735,5 +22747,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Лежачая решётка (против скота)"
@@ -22741,10 +22753,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Свойства лежачей решётки"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Проезд для автобусов"
@@ -22752,15 +22764,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Шипы"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Свойства шипов"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Платный проезд"
@@ -22768,5 +22780,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Свойства платного проезда"
@@ -22774,10 +22786,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Пограничный контороль"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Свойства пограничного контроля"
@@ -22787,5 +22799,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Живая изгородь"
@@ -22796,22 +22808,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Забор"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr "забор"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr "деревянный забор"
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr "проволочный забор"
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Стена"
@@ -22819,5 +22831,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Городская стена"
@@ -22826,5 +22838,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Подпорная стена"
@@ -22836,10 +22848,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "проход"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Свойства прохода"
@@ -22847,5 +22859,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "ворота / дверь"
@@ -22853,50 +22865,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Свойства ворот"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Шлагбаум"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Свойства шлагбаума"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Проволочные ворота"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Свойства проволочных ворот"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Ворота, открываемые бампером"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Свойства ворот, открываемых бампером"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Узкая калитка"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Свойства узкой калитки"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Ступени через ограду"
@@ -22904,25 +22916,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Свойства ступеней серез ограду"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Турникет"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Свойства турникета"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Двойные ворота"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Свойства двойных ворот"
@@ -22933,11 +22945,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Вода"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Родник"
@@ -22945,5 +22957,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Свойства родника"
@@ -22951,5 +22963,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Дренажный канал"
@@ -22957,10 +22969,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Свойства дренажного канала"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr "Канава"
@@ -22968,10 +22980,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr "Свойства канавы"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Ручей"
@@ -22979,10 +22991,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Свойства ручья"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Канал"
@@ -22990,10 +23002,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Свойства канала"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Река"
@@ -23003,5 +23015,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Свойства реки"
@@ -23009,15 +23021,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Свойства водоёма"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Суша"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Свойства суши"
@@ -23025,15 +23037,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Сточный бассейн"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Свойства сточного бассейна"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Резервуар"
@@ -23041,15 +23053,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Править резервуар"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Крытый резервуар"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Свойства крытого резервуара"
@@ -23057,5 +23069,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Берег реки"
@@ -23064,10 +23076,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Свойства берега реки"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Заболоченные земли"
@@ -23078,14 +23090,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Свойства заболоченных земель"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "лесное болото"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "торфяное болото"
@@ -23099,35 +23111,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "открытое болото"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "плавни"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "солёное болото"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "ватты"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "мангровые заросли"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Грязь"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Свойства грязи"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Пляж"
@@ -23135,20 +23147,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Свойства пляжа"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Бухта"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Свойства бухты"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Утёс"
@@ -23156,10 +23168,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Свойства утёса"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Береговая линия"
@@ -23167,5 +23179,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Свойства береговой линии"
@@ -23173,5 +23185,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Паромная переправа"
@@ -23179,5 +23191,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Свойства паромной переправы"
@@ -23186,5 +23198,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Лодочная мастерская"
@@ -23192,10 +23204,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Свойства лодочной мастерской"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Док"
@@ -23203,5 +23215,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Свойства дока"
@@ -23209,5 +23221,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Дамба"
@@ -23215,15 +23227,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Свойства дамбы"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Гидротехнические сооружения"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Ворота шлюза"
@@ -23232,5 +23244,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Водосливной порог"
@@ -23238,20 +23250,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Свойства водосливного порога"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Водопад"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Свойства водопада"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Место разворота"
@@ -23260,15 +23272,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Пристань для яхт"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Свойства пристани для яхт"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Пирс"
@@ -23276,10 +23288,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Свойства пирса"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Паромный причал"
@@ -23287,10 +23299,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Свойства паромного причала"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Слип"
@@ -23300,20 +23312,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Свойства слипа"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Транспорт"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Рельсовый транспорт"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Железная дорога"
@@ -23321,5 +23333,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Свойства железной дороги"
@@ -23349,86 +23361,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr "Ширина колеи (в мм)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "стандарт"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -23440,8 +23377,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr "Типы"
@@ -23455,29 +23392,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "депо"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "боковой путь"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "ответвление"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr "Электрифицированный"
@@ -23490,8 +23427,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr "контактный провод"
@@ -23562,8 +23499,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23575,8 +23512,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Напряжение"
@@ -23589,8 +23526,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr "Частота (Гц)"
@@ -23603,23 +23540,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Узкоколейка"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Свойства узкоколейки"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Монорельс"
@@ -23627,50 +23564,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Свойства монорельса"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Историческая железная дорога"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Свойства исторической железной дороги"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Лёгкая железная дорога"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Свойства лёгкой железной дороги"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Метрополитен"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Свойства метрополитена"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Трамвайная линия"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Свойства трамвайной линии"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Автобусные рельсы"
@@ -23678,5 +23615,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Свойства автобусных рельс"
@@ -23685,10 +23622,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Неиспользуемые пути"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Свойства неиспользуемых путей"
@@ -23697,9 +23634,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Необязательные типы"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Разобранные пути"
@@ -23708,5 +23645,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Железнодорожный переезд"
@@ -23715,5 +23652,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Переход через рельсовые пути"
@@ -23723,5 +23660,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Тип переход"
@@ -23729,5 +23666,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Поворотный стол"
@@ -23736,5 +23673,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr "Буферный упор"
@@ -23743,10 +23680,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Канатная дорога"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Кресельная"
@@ -23754,10 +23691,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Свойства кресельной дороги"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Бугельная"
@@ -23765,10 +23702,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Свойства бугельного подъёмника"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Кабиночная"
@@ -23776,10 +23713,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Свойства кабиночной канатной дороги"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Гондольная"
@@ -23787,10 +23724,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Свойства гондольной канатной дороги"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23799,5 +23736,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23805,5 +23742,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -23812,5 +23749,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -23818,5 +23755,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Заправочная станция"
@@ -23826,62 +23763,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Свойства заправочной станции"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr "Agip"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr "Aral"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr "Avia"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr "BP"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr "Esso"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr "OMV"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr "Q8"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr "Repsol"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr "Shell"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr "Statoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr "Tamoil"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr "Texaco"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "Total"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr "Indipend."
@@ -23939,32 +23876,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Часы работы"
@@ -24023,165 +23960,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Mo-Fr 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 
-#: build/trans_presets.java:1341
+#: build/trans_presets.java:1334
 msgid "Fuel types:"
 msgstr "Виды топлива:"
 
 #. item "Car/Fuel" label "Fuel types:"
-#: build/trans_presets.java:1342
+#: build/trans_presets.java:1335
 msgid "Diesel"
 msgstr "дизельное"
 
 #. item "Car/Fuel" check "Diesel"
-#: build/trans_presets.java:1343
+#: build/trans_presets.java:1336
 msgid "Bio Diesel"
 msgstr "биодизель"
 
 #. item "Car/Fuel" check "Bio Diesel"
-#: build/trans_presets.java:1344
+#: build/trans_presets.java:1337
 msgid "Diesel (Gas To Liquid - ultimate diesel)"
 msgstr "дизельное синтетическое (GTL-технология)"
 
 #. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
-#: build/trans_presets.java:1345
+#: build/trans_presets.java:1338
 msgid "Diesel for Heavy Good Vehicles"
 msgstr "дизельное для тяжёлого транспорта"
 
 #. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
-#: build/trans_presets.java:1346
+#: build/trans_presets.java:1339
 msgid "Octane 91"
 msgstr "бензин АИ-91"
 
 #. item "Car/Fuel" check "Octane 91"
-#: build/trans_presets.java:1347
+#: build/trans_presets.java:1340
 msgid "Octane 95"
 msgstr "бензин АИ-95"
 
 #. item "Car/Fuel" check "Octane 95"
-#: build/trans_presets.java:1348
+#: build/trans_presets.java:1341
 msgid "Octane 98"
 msgstr "бензин АИ-98"
 
 #. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
+#: build/trans_presets.java:1342
 msgid "Octane 100"
 msgstr "бензин АИ-100"
 
 #. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
+#: build/trans_presets.java:1343
 msgid "E10 (10% Ethanol mix)"
 msgstr "E10 (10% смесь этанола)"
 
 #. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
+#: build/trans_presets.java:1344
 msgid "E85 (85% Ethanol mix)"
 msgstr "E85 (85% смесь этанола)"
 
 #. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
+#: build/trans_presets.java:1345
 msgid "LPG (Liquefied petroleum gas)"
 msgstr "пропан-бутан (АГЗС)"
 
 #. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
+#: build/trans_presets.java:1346
 msgid "CNG (Compressed Natural Gas)"
 msgstr "природный газ"
 
 #. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
+#: build/trans_presets.java:1347
 msgid "1/25 mix (mofa/moped)"
 msgstr "топливная смесь 1/25 (для мопедов)"
 
 #. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
+#: build/trans_presets.java:1348
 msgid "1/50 mix (mofa/moped)"
 msgstr "топливная смесь 1/50 (для мопедов)"
@@ -24198,5 +24135,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -24206,5 +24143,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Свойства стоянки"
@@ -24215,25 +24152,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Справочный номер"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "многоуровневая"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "наземная"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "подземная"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "Перехватывающая парковка"
@@ -24242,48 +24179,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Денежный сбор"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Вместимость (общая)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Места для инвалидов"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Места для женщин"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Места для родителей"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Смотри в Wiki другие категории вместимости capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Автомойка"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Свойства автомойки"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Автомастерская"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Свойства автомастерской"
@@ -24291,5 +24228,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Прокат"
@@ -24298,10 +24235,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Свойства проката автомобилей"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Кратковременный прокат"
@@ -24309,5 +24246,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Свойсттва кратковременного проката автомобилей"
@@ -24315,10 +24252,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Свойства велосипедной стоянки"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Вместимость"
@@ -24327,10 +24264,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Свойства велопроката"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -24340,5 +24277,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -24346,5 +24283,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "код UIC"
@@ -24352,5 +24289,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Остановочный пункт"
@@ -24358,5 +24295,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Свойства остановочного пункта"
@@ -24364,5 +24301,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Трамвайная остановка"
@@ -24371,5 +24308,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Свойства трамвайной остановки"
@@ -24377,5 +24314,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Платформа"
@@ -24384,5 +24321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Свойства железнодорожной платформы"
@@ -24394,5 +24331,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Номер платформы (пути)"
@@ -24400,10 +24337,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Полигон"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Вход в метро"
@@ -24412,10 +24349,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Свойства входа в метро"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Инвалидное кресло"
@@ -24424,5 +24361,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Автобусная станция"
@@ -24431,5 +24368,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Свойства автобусной станции"
@@ -24437,5 +24374,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Автобусная остановка"
@@ -24445,5 +24382,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Свойства автобусной остановки"
@@ -24452,6 +24389,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Навес"
@@ -24459,19 +24396,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Скамейка"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr "Тактильное мощение"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Автобусная платформа"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Свойства автобусной платформы"
@@ -24479,5 +24416,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Такси"
@@ -24485,5 +24422,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Свойства стоянки такси"
@@ -24491,10 +24428,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Аэропорт"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr "Территория аэропорта"
@@ -24502,5 +24439,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr "Свойства территории аэропорта"
@@ -24508,10 +24445,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "Код ИАТА"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "Код ИКАО"
@@ -24520,5 +24457,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr "Взлётно-посадочная полоса"
@@ -24526,5 +24463,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr "Свойства взлётно-посадочной полосы"
@@ -24532,5 +24469,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr "Рулёжная дорожка"
@@ -24538,5 +24475,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr "Свойства рулёжной дорожки"
@@ -24544,5 +24481,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr "Вертолётная площадка"
@@ -24550,5 +24487,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr "Свойства вертолётной площадки"
@@ -24558,5 +24495,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr "Перрон"
@@ -24566,5 +24503,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr "Ангар"
@@ -24575,6 +24512,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Бакен"
@@ -24584,5 +24521,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr "Ветроуказатель (флюгер)"
@@ -24591,5 +24528,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr "Терминал"
@@ -24597,5 +24534,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr "Свойства терминала"
@@ -24603,15 +24540,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr "Свойства терминала аэропорта"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Путешествия"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Проживание"
@@ -24623,5 +24560,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Гостиница"
@@ -24630,15 +24567,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Свойства гостиницы"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Звёзды"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Мотель"
@@ -24646,20 +24583,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Свойства мотеля"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Домик для гостей"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Свойства домика для гостей"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Съёмный домик (шале)"
@@ -24667,10 +24604,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Свойства съёмного домика (шале)"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Общежитие / хостел"
@@ -24678,30 +24615,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Свойства общежития (хостела)"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Альпинистский домик"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Свойства альпинистского домика"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Стоянка фургонов"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Свойства стоянки фургонов"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Кемпинг"
@@ -24709,10 +24646,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Свойства кемпинга"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Общественное питание"
@@ -24723,5 +24660,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Ресторан"
@@ -24729,5 +24666,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Свойства ресторана"
@@ -24735,5 +24672,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Кухня"
@@ -24741,73 +24678,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "итальянская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "китайская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "пицца"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "бутерброды"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "греческая"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "немецкая"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "индийская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "местная"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "шашлык"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "турецкая"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "азиатская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "тайская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "мексиканская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "японская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr "французская"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr "сэндвичи"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr "суши"
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Ресторан быстрого питания"
@@ -24815,17 +24752,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Свофства ресторана быстрого питания"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr "рыба и чипсы"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr "курятина"
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Кафе"
@@ -24833,9 +24770,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Свойства кафе"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Пивная"
@@ -24843,18 +24780,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Свойства пивной"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Пивной сад"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Свойства пивного сада"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Бар"
@@ -24862,9 +24799,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Свойства бара"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Ночной клуб"
@@ -24872,24 +24809,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Свойства ночного клуба"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Туризм"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Достопримечательности"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Свойства достопримечательности"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Музей"
@@ -24897,9 +24834,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Свойства музея"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Зоопарк"
@@ -24908,9 +24845,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Свойства зоопарка"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Место с хорошим видом"
@@ -24918,24 +24855,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Свойства места с хорошим видом"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Наблюдательная вышка"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Парк развлечений"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Свойства парка развлечений"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Произведения искусства"
@@ -24943,5 +24880,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Свойства произведений искусств"
@@ -24949,19 +24886,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Справочное бюро"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Карта"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Тип карты"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "топографическая"
@@ -24999,5 +24936,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -25005,28 +24942,28 @@
 msgstr "карта улиц"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "план-схема"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Показанная область"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "окрестность"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "город"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "регион"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Подробное описание"
@@ -25036,5 +24973,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Показаны маршруты:"
@@ -25042,5 +24979,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "пешие"
@@ -25048,6 +24985,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "велосипедные"
@@ -25055,5 +24992,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "для горного велосипеда"
@@ -25061,6 +24998,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "лыжные"
@@ -25068,5 +25005,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "конные"
@@ -25074,46 +25011,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "...другие возможные способы передвижения"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Информационный стенд"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Содержимое указателя"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "объявления"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "история"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "природа"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "животный мир"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "растения"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Указатель направлений"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Информационная стойка"
@@ -25121,29 +25058,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Подробное описание"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Аудиогид"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Аудиогид через мобильный телефон?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Номер телефона"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Другие справочные бюро"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Свойства навеса"
@@ -25151,25 +25088,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Очаг"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Место для пикника"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "свойства места для пикника"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Исторические места"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Замок"
@@ -25178,19 +25115,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Свойства замка"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Развалины"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Свойства развалин"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Археологические раскопки"
@@ -25199,9 +25136,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Свойства археологических раскопок"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Поле битвы"
@@ -25209,10 +25146,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Свойства поля битвы"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Палеонтологические раскопки"
@@ -25220,5 +25157,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Свойства палеонтологических раскопок"
@@ -25226,15 +25163,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Монумент"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Свойства монумента"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Памятник"
@@ -25242,55 +25179,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Свойства памятника"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Придорожный крест"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Свойства придорожного креста"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Придорожная святыня"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Свойства придорожной святыни"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Пограничный камень"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Свойства пограничного камня"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Досуг"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Аквапарк"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Свойства аквапарка"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Игровая площадка"
@@ -25298,35 +25235,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Свойства игровой площадки"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Место для рыбалки"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Свойства места для рыбалки"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Спорт"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Спортивные сооружения"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Стадион"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Свойства стадиона"
@@ -25340,6 +25277,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "вид спорта:"
@@ -25731,6 +25668,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25764,225 +25701,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "несколько"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "стрельба из лука"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "атлетика"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "австралийский футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "бейсбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "баскетбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "бочче"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "боулз"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "гребля на каное / каяке"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "скалолазание"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "крикет"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "тренировочные сетки для крикета"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "крокет"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "велоспорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "собачьи бега"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "конный спорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "американский футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "гольф"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "гимнастика"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "хоккей"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "лошадиные бега"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "моторный спорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "пелота"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "ракетбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "рэгби"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "стрельба"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "скейтборд"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "фигурное катание"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "лыжный спорт"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "футбол"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "плавание"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "настольный теннис"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "теннис"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Спортивный центр"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Свойства спортивного центра"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Спортивное поле"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Свойства спортивного поля"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Трек"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Свойства трека"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Поле для гольфа"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Свойства поля для гольфа"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Поле для минигольфа"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Свойства поля для минигольфа"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Спорт"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Многоборье"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Править Многоборье"
@@ -26021,21 +25958,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "вид"
@@ -26074,203 +26011,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "спортивное поле"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "спортивный центр"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "стадион"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "трек"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "Боулинг (10-кегельный)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Свойства боулинга"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Атлетика"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Свойства атлетики"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Стрельба из лука"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Свойства стрельбы из лука"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Скалолазание"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Свойства скалолазания"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Гребля на каное / каяке"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Свойства гребли на каное / каяке"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Свойства велоспорта"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Собачьи бега"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Свойства собачьих бегов"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Конный спорт"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Править конный спорт"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Лошадиные бега"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Править лошадиные бега"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Гимнастика"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Свойства гимнастики"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Моторные виды спорта"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Править моторные виды спорта"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Фигурное катание"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Свойства фигурного катания"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Скейтбординг"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Свойства скейтбординга"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Плавание"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Свойства плавания"
@@ -26278,52 +26215,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Свойства лыжного спорта"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Тип лыжни"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "горные лыжи"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "беговые лыжи"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "снежный парк"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Сложность"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "начальный"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "лёгкий"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "сложный"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "очень сложный"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "фрирайд"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Стрельба"
@@ -26331,177 +26268,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Свойства стрельбы"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Спорт (с мячом)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Футбол (европейский)"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Свойства футбола"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Американский футбол"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Свойства американского футбола"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Австралийский футбол"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Свойства австралийского футбола"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Бейсбол"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Баскетбол"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Свойства бейсбола"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Гольф"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Свойства гольфа"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "поле для гольфа"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Бочче"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Свойства бочче"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Боулз"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Свойства боулз"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Крикет"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Свойства крикета"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Тренировочные сетки для крикета"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Свойства тренировочных сеток для крикет"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Крокет"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Свойства крокета"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Хоккей"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Свойства крокета"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Пелота"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Свойства пелоты"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Ракетбол"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Свойства ракетбола"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Регби"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Свойства регби"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Настольный теннис"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Свойства настольного тенниса"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Теннис"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Свойства тенниса"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Рукотворное"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Здание"
@@ -26509,5 +26446,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Общественное здание"
@@ -26515,10 +26452,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Свойства общественного здания"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Муниципалитет"
@@ -26526,10 +26463,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Свойства муниципалитета"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Посольство"
@@ -26537,10 +26474,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Свойства посольства"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Суд"
@@ -26549,10 +26486,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Свойства суда"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Тюрьма"
@@ -26561,10 +26498,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Свойства тюрьмы"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Полиция / милиция"
@@ -26574,10 +26511,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "свойства полиции / милиции"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Пожарное депо"
@@ -26586,10 +26523,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Свойства пожарного депо"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Почтовое отделение"
@@ -26597,5 +26534,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Свойства почтамта"
@@ -26603,15 +26540,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Детский сад"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Свойства детского сада"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Школа"
@@ -26619,10 +26556,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Свойства школы"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Вуз"
@@ -26630,10 +26567,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Свойства вуза"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Профессиональное училище"
@@ -26641,5 +26578,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Свойства профессионального училища"
@@ -26647,5 +26584,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Кинотеатр"
@@ -26654,10 +26591,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Свойства кинотеатра"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Библиотека"
@@ -26666,9 +26603,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Свойства библиотеки"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Центр искусств"
@@ -26676,10 +26613,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Свойства центра искусств"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Театр"
@@ -26688,10 +26625,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Свойства театра"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Культовое место"
@@ -26701,5 +26638,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Свойства культового места"
@@ -26708,6 +26645,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Религия"
@@ -26716,66 +26653,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "бахаи"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "буддизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "христианство"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "индуизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "джайнизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "иудаизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "ислам"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "сикхизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "спиритуализм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "даосизм"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "унитарианство"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "зороастризм"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Конфессия"
@@ -26784,81 +26721,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "англиканская"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "баптисты"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "католики"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "евангелисты"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "свидетели иеговы"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "лютеране"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "методисты"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "мормоны"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "православные"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "пятидесятники"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "пресвитериане"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "протестанты"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "квакеры"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "шииты"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "сунниты"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Адреса"
@@ -26867,5 +26804,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Правка адресов"
@@ -26873,5 +26810,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Номер дома"
@@ -26879,25 +26816,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Название дома"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Улица"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Город"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Почтовый индекс"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Код страны"
@@ -26906,5 +26843,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Править интерполяцию адресов"
@@ -26912,61 +26849,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Схема нумерации"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "нечётные"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "чётные"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "алфавитный"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Рукотворное"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Цеха"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Свойства цехов"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Башня"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Свойства башни"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Назначение башни"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "связная"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "наблюдательная"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Высота (в метрах)"
@@ -26974,25 +26911,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Водонапорная башня"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Свойства водонапорной башни"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Газгольдер"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Свойства газгольдера"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Маяк"
@@ -27000,10 +26937,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Свойства маяка"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Ветряная мельница"
@@ -27011,10 +26948,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Свойства ветряной мельницы"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Трубопровод"
@@ -27023,41 +26960,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Свойства трубопровода"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "газ"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "теплотрасса"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "нефть"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "канализация"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "любого назначения"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Расположение"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "подводная"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "надземная"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Очистные сооружения"
@@ -27067,10 +27004,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Свойства чистных сооружений"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Кран"
@@ -27078,5 +27015,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Свойства крана"
@@ -27084,10 +27021,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Свойства бакена"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Геодезический пункт"
@@ -27095,10 +27032,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Свойства геодезического пункта"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Камера наблюдения"
@@ -27106,23 +27043,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Свойства камеры наблюдения"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr "внутренняя"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr "внешняя"
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr "общедоступное"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Электростанция"
@@ -27132,35 +27069,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Свойства электростанции"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "ветряная"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "гидро"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "тепловая"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "атомная"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "угольная"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "солнечная"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Электроподстанция"
@@ -27169,10 +27106,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Свойства электроподстанции"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Трансформаторная будка"
@@ -27181,5 +27118,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Свойства трансформаторной будки"
@@ -27187,10 +27124,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Табличка на линии электропередач"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Опора ЛЭП"
@@ -27201,23 +27138,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Свойства опоры ЛЭП"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "вышка"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "столб"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Номер вышки"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Линия электропередач"
@@ -27226,74 +27163,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Свойства линии электропередач"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Тип линии"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "высоковольтная"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "среднего / низкого напряжения"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Количество токонесущих кабелей (без грозозащитных)"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Расщепление фаз (число раздельных проводов)"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "один провод"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "два провода"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "три провода"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "четыре провода"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Удобства"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Туалет"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr "ограничено"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Примечание"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Почтовый ящик"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Телефон"
@@ -27302,5 +27239,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Свойства телефона"
@@ -27308,5 +27245,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Монеты"
@@ -27314,5 +27251,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Банкноты"
@@ -27320,5 +27257,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Электронные средства оплаты"
@@ -27326,5 +27263,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Дебетные карты"
@@ -27332,15 +27269,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Кредитные карты"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Телефонные карты"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Пункт приёма утильсырья"
@@ -27349,5 +27286,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Свойства пункта приёма утильсырья"
@@ -27355,35 +27292,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Батарейки"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Консервные банки"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Одежда"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Стекло"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Бумага"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Металлолом"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr "Урна для мусора"
@@ -27391,5 +27328,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr "Свойства урны для мусора"
@@ -27398,31 +27335,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Спинка"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Материал"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "камень"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "пластик"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Цвет"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "чёрный"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "коричневый"
@@ -27501,5 +27438,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27509,31 +27446,31 @@
 msgstr "зелёный"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "красный"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "синий"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "серый"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "белый"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Количество мест"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Охотничья вышка"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Свойства охотничьей вышки"
@@ -27542,30 +27479,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Высота"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "низкая"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "половинная"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "полная"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Скрытая"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Запирается"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Фонтан"
@@ -27574,10 +27511,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Свойства фонтана"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Питьевая вода"
@@ -27586,10 +27523,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Свойства питьевой воды"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr "Пожарный кран"
@@ -27598,5 +27535,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr "Свойства пожарного крана"
@@ -27604,5 +27541,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Детский дом"
@@ -27610,15 +27547,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Свойства детского дома"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Магазины, служба быта"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr "Автомагазин"
@@ -27626,10 +27563,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Свойства автомагазина"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr "Веломагазин"
@@ -27638,28 +27575,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Свойства веломагазина"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Супермаркет"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Свойства супермаркета"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Бытовая химия"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Свойства магазина бытовой химии"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Магазин шаговой доступности"
@@ -27667,9 +27604,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Свойства магазина шаговой доступности"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Киоск"
@@ -27677,27 +27614,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Свойства киоска"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Книжный магазин"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Свойства книжного магазина"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Туристическое агенство"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Свойства туристического агентства"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Мясная лавка"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Свойства мясной лавки"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Булочная"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Свойства булочной"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Цветочный магазин"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Свойства цветочного магазина"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Натуральные продукты"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Свойства магазина натуральных продуктов"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Алкогольная продукция"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Свойства магазина алкогольной продукции"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Напитки"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Свойства магазина напитков"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Компьютеры"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Свойства компьютерного магазина"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Бытовая электроника"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Свойства магазина бытовой электроники"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Звуковая аппаратура"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Свойства магазина звуковой аппаратуры"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Мебель"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Свойства мебельного магазина"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Садово-огородный магазин"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Свойства садово-огородного магазина"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Хозяйственный магазин"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Свойства хозяйственного магазина"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Строительный магазин"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Свойства строительного магазина"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Канцтовары"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Свойства магазина канцтоваров"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Парикмахерская"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Свойства парикмахерской"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Обувь"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Свойство обувного магазина"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Игрушки"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Свойства магазина игрушек"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Видео"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Свойства магазина видео"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Химчистка"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Свойства химчистки"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Прачечная"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Свойства прачечной"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Товары для активного отдыха"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Свойства магазина товаров для активного отдыха"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Свойства спортивного магазина"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Оптика"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Свойства магазина оптики"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Торговый автомат"
@@ -27705,5 +27856,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Свойства торгового автомата"
@@ -27711,306 +27862,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Реализуемая продукция"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "билеты на общественный транспорт"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "схемы обественного транспорта"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "талоны на парковку"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "продукты питания"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "напитки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "сладости"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "сигареты"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "фотографии"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "еда для животных"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "газеты"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "игрушки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "марки"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-карты"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "телефонные карты"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "ваучеры"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "велосипедный"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "презервативы"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "тампоны"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "пакеты для экскрементов"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "накопительные, дисконтные карты"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Мясная лавка"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Свойства мясной лавки"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Булочная"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Свойства булочной"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Цветочный магазин"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Свойства цветочного магазина"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Натуральные продукты"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Свойства магазина натуральных продуктов"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Алкогольная продукция"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Свойства магазина алкогольной продукции"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Напитки"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Свойства магазина напитков"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Компьютеры"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Свойства компьютерного магазина"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Бытовая электроника"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Свойства магазина бытовой электроники"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Звуковая аппаратура"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Свойства магазина звуковой аппаратуры"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Мебель"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Свойства мебельного магазина"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Садово-огородный магазин"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Свойства садово-огородного магазина"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Хозяйственный магазин"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Свойства хозяйственного магазина"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Строительный магазин"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Свойства строительного магазина"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Канцтовары"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Свойства магазина канцтоваров"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Парикмахерская"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Свойства парикмахерской"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Обувь"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Свойство обувного магазина"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Игрушки"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Свойства магазина игрушек"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Видео"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Свойства магазина видео"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Химчистка"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Свойства химчистки"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Прачечная"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Свойства прачечной"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Товары для активного отдыха"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Свойства магазина товаров для активного отдыха"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Свойства спортивного магазина"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Оптика"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Свойства магазина оптики"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Финансы"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Банк"
@@ -28018,14 +27961,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Свойства банка"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Банкомат"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Обмен валют"
@@ -28033,5 +27976,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Свойства пункта обмена валют"
@@ -28039,15 +27982,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Свойства банкомата"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Здравоохранение"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Врач"
@@ -28055,18 +27998,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Свойства врача"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Стоматология"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Свойства стоматологии"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Аптека"
@@ -28074,5 +28017,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Свойства аптеки"
@@ -28080,9 +28023,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Отпуск лекарств по рецептам"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Больница"
@@ -28090,10 +28033,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Свойства больницы"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Пункт экстренного вызова"
@@ -28102,5 +28045,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Свойства пункта экстренного вызова"
@@ -28109,20 +28052,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Номер пункта"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Название точки"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Номер телефона"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Используйте международный код, например: +7-916-0857403)"
@@ -28130,5 +28073,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Ветеринария"
@@ -28137,64 +28080,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Свойства ветеринарии"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "География"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Места"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Континент"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Свойства континента"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Страна"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Свойства страны"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Штат"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Свойства штата"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Область"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Свойства области"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Округ"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Свойства округа"
@@ -28202,15 +28145,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Город (более 100 000)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Свойства большого города"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Город (до 100 000)"
@@ -28218,10 +28161,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Свойствао малого города / посёлка"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Пригород"
@@ -28229,25 +28172,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Свойства пригорода"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Село"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Свойства села"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Деревня"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Свойства деревни"
@@ -28255,5 +28198,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Местность"
@@ -28261,10 +28204,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Свойства местности"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Остров"
@@ -28272,10 +28215,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Свойства острова"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Островок"
@@ -28283,5 +28226,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Свойства островка"
@@ -28289,5 +28232,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Вход в пещеру"
@@ -28295,10 +28238,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Свойства входа в пещеру"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Вершина"
@@ -28306,10 +28249,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Свойства вершины"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Ледник"
@@ -28317,10 +28260,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Свойства ледника"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Вулкан"
@@ -28328,70 +28271,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Свойства вулкана"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Границы"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Государственная"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Свойства государственной границы"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Административная"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Свойства административной границы"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Гражданская"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Свойства политико-административной границы"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Политическая"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Свойства политической границы"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Национальный парк"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Свойства национального парка"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Землепользование"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Дерево"
@@ -28400,15 +28343,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Свойства дерева"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Научное название"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Лес"
@@ -28417,5 +28360,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Свойства леса"
@@ -28423,17 +28366,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Хвойный"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "Лиственный"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "Смешанный"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Лесопосадки"
@@ -28442,14 +28385,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Свойства лесопосадок"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Заповедник"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Свойства заповедника"
@@ -28457,25 +28400,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Каменистая осыпь"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Свойства каменистой осыпи"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Заросли устарника"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Свойства зарослей кустарника"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Каменистая пустошь"
@@ -28483,10 +28426,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Свойства каменистой пустоши"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Пустырь"
@@ -28494,5 +28437,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Свойства пустыря"
@@ -28500,5 +28443,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Двор фермы"
@@ -28507,45 +28450,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Свойства двора фермы"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Сельскохозяйственные угодья"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Свойства сельскохозяйственных угодий"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Сенокосный луг"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Свойства сенокосного луга"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Виноградники"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Свойства виноградников"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Огородные участки"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Свойства огородных участков"
@@ -28553,25 +28496,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Сады"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Свойства садов"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Газон"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Свойства газона"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Площадка для праздников"
@@ -28579,10 +28522,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Свойства площадки для праздников"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Общественные земли"
@@ -28590,20 +28533,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Свойства общественных земель"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Парк"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Свойства парка"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Игровая площадка"
@@ -28611,5 +28554,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Свойства игровой площадки"
@@ -28617,15 +28560,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Жилая зона"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Свойства жилой зоны"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Погост"
@@ -28633,9 +28576,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Свойства погоста"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Кладбище"
@@ -28643,39 +28586,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Свойства кладбища"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Розничная торговля"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Свойства зоны розничной торговли"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Деловая территория"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Свойства деловой территории"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Промышленная территория"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Свойства промышленной территории"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Территория железной дороги"
@@ -28683,15 +28626,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Свойства территории железной дороги"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Военная зона"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Свойства военной зоны"
@@ -28699,50 +28642,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Строительная площадка"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Свойства стройплощадки"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Расчистка застройки"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Свойства расчистки застройки"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Зона под застройку"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Свойства зоны под застройку"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Свалка"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Свойства свалки"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Карьер"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Свойства карьера"
@@ -28752,5 +28695,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Править мультиполигон"
@@ -28759,10 +28702,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "внешний сегмент"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "внутренний сегмент"
@@ -28770,47 +28713,47 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
-msgstr "Ограничение движения"
+msgstr "Ограничение на поворот"
 
 #. item "Relations/Turn restriction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
-msgstr "Свойства ограничения движения"
+msgstr "Свойства ограничения на поворот"
 
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Ограничение"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "поворот налево запрещён"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "поворот направо запрещён"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "движение прямо запрещено"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "разворот запрещён"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "только направо"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "только налево"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "только прямо"
@@ -28819,15 +28762,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "с линии"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "через точку или линию"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "на линию"
@@ -28835,5 +28778,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Маршрут"
@@ -28842,5 +28785,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Свойства маршрута"
@@ -28848,5 +28791,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Тип маршрута"
@@ -28937,5 +28880,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28945,17 +28888,17 @@
 msgstr "велосипедный"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "автобусный"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "трасса"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "паромный"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "лыжный"
@@ -29015,5 +28958,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -29022,9 +28965,9 @@
 msgstr "пеший"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "трамвайный"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "объездной"
@@ -29038,10 +28981,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "линия метро"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Описание знака"
@@ -29049,31 +28992,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Сеть"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Состояние маршрута"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "планируемый"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "альтернативный"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "временный"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "соединяющий"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Цвет (hex)"
@@ -29082,32 +29025,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "сегмент маршрута"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "сегмент вперёд"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "сегмент назад"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "конечная точка"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "конечная вперёд"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "конечная назад"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "стандарт"
 
 #. mappaint style named "standard"
@@ -33131,4 +33149,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Италия"
+
+#~ msgid "Bikes"
+#~ msgstr "Велосипеды"
 
 #~ msgid "No data imported."
Index: /applications/editors/josm/i18n/po/sk.po
===================================================================
--- /applications/editors/josm/i18n/po/sk.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/sk.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-13 18:59+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-18 17:06+0000\n"
 "Last-Translator: Vlado <babicvm@szm.sk>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:38+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1201,5 +1201,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Nemôžem presúvať objekty mimo svet."
@@ -1536,5 +1536,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2321,9 +2321,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2407,27 +2407,27 @@
 msgstr "Koniec kreslenia."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Vyťiahnuť (extrude)"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Vytvoriť plochy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Vyťiahnuť cestu"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Posuň segment pozdĺž jeho normály, potom pusť tlačítko na myši."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "Nakreslite obdĺžnik požadovanej veľkosti a potom pustite tlačítko myši."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2449,6 +2449,6 @@
 "záznam prehrávať; SHIFT+uvoľnite synchronizovaný zvukový záznam v tom bode."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2460,9 +2460,9 @@
 msgstr "Výber"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Zvoliť, posunúť a otáčať objekty"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2472,17 +2472,17 @@
 msgstr[2] "Pridať a posunúť virtuálny nový bod do {0} ciest"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Posunúť elementy"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Posunúť ich"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Krok späť posun"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2494,19 +2494,19 @@
 "Skutočne ich chcete presunúť?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Pustite tlačítko myši pre vybratie objektov v obdĺžniku."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+msgid ""
+"Release the mouse button to stop moving. Ctrl to merge with nearest node."
+msgstr ""
+"Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
+
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
-msgid ""
-"Release the mouse button to stop moving. Ctrl to merge with nearest node."
-msgstr ""
-"Pustite tlačítko myši pre zastavenie pohybu. Ctrl spojí s najbližším bodom."
-
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid "Release the mouse button to stop rotating."
 msgstr "Pustite tlačítko myši k zastaveniu otáčania"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3278,5 +3278,5 @@
 msgstr "Použiť?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3684,19 +3684,20 @@
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:265
 msgid "<h2>Filter active</h2>"
-msgstr ""
+msgstr "<h2>Aktívny filter</h2>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:271
 #, java-format
 msgid "<p><b>{0}</b> objects hidden"
-msgstr ""
+msgstr "<p><b>{0}</b> skryté objekty"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:279
 #, java-format
 msgid "<b>{0}</b> objects disabled"
-msgstr ""
+msgstr "<b>{0}</b> vypnuté objekty"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/Filters.java:282
 msgid "</p><p>Close the filter dialog to see all objects.<p></html>"
 msgstr ""
+"</p><p>Zatvorte dialóg filtra, aby sa zobrazili všetky objekty.<p></html>"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:463
@@ -3889,17 +3890,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "štandartný"
+msgstr "Bod: štandardný"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "spojenie"
+msgstr "Bod: Pripojený"
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "značkované"
+msgstr "Bod: označkovaný"
 
 #. teal
@@ -4082,5 +4080,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "železnica"
@@ -5441,5 +5439,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "všetky"
@@ -5887,4 +5885,9 @@
 msgstr "Režim filter"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5975,5 +5978,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relácie"
@@ -6075,9 +6078,9 @@
 msgstr "Výber: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Uvoľniť panel"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -6086,5 +6089,5 @@
 "lište."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Kliknite pre minimalizovanie/maximalizovanie obsahu panelu"
@@ -6432,4 +6435,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6442,10 +6451,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -7115,145 +7118,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Názov"
@@ -8560,10 +8563,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Typ"
@@ -8571,5 +8574,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8583,17 +8585,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "neznámy"
@@ -9454,11 +9455,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9475,14 +9478,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Vrstva"
@@ -10076,5 +10079,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Popis"
@@ -11246,26 +11249,26 @@
 msgstr "Zatvorte dialóg a prijmite autorizačný prístup"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr "Varovanie: Nepodarilo sa zrušiť bežiacu OAuth operáciu"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr "Získavam OAuth žiadosť prístupu z ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr "Získavam OAuth autorizovaný prístup z ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr "OSM stránka nevrátila session cookie v reakcii na ''{0}'',"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
@@ -11273,29 +11276,29 @@
 "Nepodarilo sa overiť užívateľa ''{0}'' s heslom''***'' ako užívateľa OAuth"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr "Nepodarilo sa povoliť OAuth žiadosť ''{0}''"
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
 #, java-format
 msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
 msgstr "Povoľujem OAuth žiadosť prístupu ''{0}'' na stránkach OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
 msgid "Initializing a session at the OSM website..."
 msgstr "Inicializojem sedenie na internetovej stránke OSM ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr "Overovanie sedenia pre užívateľa ''{0}'' ..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr "Povoľujem žiadosť prístupu ''{0}''..."
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11820,5 +11823,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Vozidlo"
@@ -11840,16 +11843,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bicykel"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11879,12 +11883,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Pešo"
@@ -12624,17 +12628,14 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:601
-#, fuzzy
 msgid "Action parameters"
-msgstr "Rozšírené OAuth parametre"
+msgstr "Parametre akcie"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Názov ulice"
+msgstr "Názov parametra"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Namerané hodnoty"
+msgstr "Hodnota parametra"
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -13617,7 +13618,7 @@
 msgid "Uploading {0} object..."
 msgid_plural "Uploading {0} objects..."
-msgstr[0] "Nahrávanie (0) objektu ..."
-msgstr[1] "Nahrávanie (0) objektov ..."
-msgstr[2] "Nahrávanie (0) objektov ..."
+msgstr[0] "Nahrávanie {0} objektov ..."
+msgstr[1] "Nahrávanie {0} objektu ..."
+msgstr[2] "Nahrávanie {0} objektov ..."
 
 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:446
@@ -14548,5 +14549,5 @@
 "change it later)"
 msgstr ""
-"Nepýtajte sa znovu a zapamätajte si moje rozhodnutie (Choď na Nastavenia-> "
+"Nepýtať sa znovu a zapamätať si moje rozhodnutie (Choďte na Nastavenia-> "
 "Pluginy zmeniť neskôr )"
 
@@ -15163,6 +15164,7 @@
 msgstr "Nahrať Stopy (Traces)"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "Viditeľnosť"
@@ -15253,5 +15255,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolácia adries"
@@ -15439,5 +15441,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr "Vytvoriť budovu"
@@ -15478,19 +15480,19 @@
 msgstr "Nastaviť šírku budov"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr "Zachytiť(grab) budovy"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr "Získať budovy kliknutím (iba vektorové obrázky)"
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Budovy, stavby"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -15500,5 +15502,5 @@
 "katastra nehnuteľností(Fr) a dátovú vrstvu OSM."
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -15514,10 +15516,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr "Vybrať Feuille"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -15561,7 +15563,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambert Zóna 4 cache súbor (.4)"
+msgstr "Reunion RGR92 cache file (.UTM4)"
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -15715,5 +15716,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -17602,5 +17603,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Hromadná doprava"
@@ -17652,5 +17653,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Cestné objekty"
@@ -18184,13 +18185,13 @@
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer"
-msgstr ""
+msgstr "Tracer"
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44
 msgid "Tracer."
-msgstr ""
+msgstr "Tracer."
 
 #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136
 msgid "Tracer building"
-msgstr ""
+msgstr "Tracer stavieb"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/CreateOrEditTurnRestrictionAction.java:43
@@ -18236,4 +18237,23 @@
 "V nasledujúcej tabuľke si môžete upraviť <strong> neupravené členy </strong> "
 "reprezentujúce vzťahy v OSM tieto zákazy odbočenia."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Typ"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "Zo:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+#, fuzzy
+msgid "To:"
+msgstr "Do:"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
@@ -18416,4 +18436,18 @@
 msgstr "Už sa zúčastňujú konfliktu"
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Vybazať zo zákazu odbočenia"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+#, fuzzy
+msgid "Select this turn restriction"
+msgstr "Vybazať zo zákazu odbočenia"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:843
 #, java-format
@@ -18537,21 +18571,21 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:156
 msgid "Remove the currently selected vias"
-msgstr ""
+msgstr "Vymazať aktuálne vybraté \"vias(cez)\""
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:177
 msgid "Move the selected vias down by one position"
-msgstr ""
+msgstr "Presunutie vybratých \"vias(cez)\" dole o jednu pozíciu"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:203
 msgid "Move the selected vias up by one position"
-msgstr ""
+msgstr "Presunutie vybratých \"vias(cez)\" hore o jednu pozíciu"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:231
 msgid "Copy the selected vias to the clipboard"
-msgstr ""
+msgstr "Kopírovať vybrané \"vias(cez)\" do schránky"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaList.java:264
 msgid "Insert 'via' objects from the clipboard"
-msgstr ""
+msgstr "Vložiť 'via(cez)' objekty zo schránky"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/ViaListModel.java:177
@@ -18561,4 +18595,6 @@
 "''via''."
 msgstr ""
+"Nepodarilo sa získať OSM objekt s id {0} z dátového súboru {1}. Nemožno "
+"pridať ako \"vias(cez)\"."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/list/TurnRestrictionCellRenderer.java:125
@@ -18655,8 +18691,11 @@
 "disabled, editing of via-objects is possible in the Advanced Editor only."
 msgstr ""
+"Základný Editor môže voliteľne zobraziť zoznam \"via(cez)\"-objektov zákazu "
+"odbočenia. Ak je povolené, je možné aj upravovať v Základnom editore. Ak je "
+"vypnuté, editácia \"via(cez)\"-objektov je možné iba v pokročilom editore."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:60
 msgid "Display and edit list of via-objects in the Basic Editor"
-msgstr ""
+msgstr "Zobraziť a editovať zoznam \"via(cez)\"-objektov v Základnom Editore"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/preferences/PreferencesPanel.java:78
@@ -18780,5 +18819,5 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:31
 msgid "Go to Basic Editor and manually choose a turn restriction type"
-msgstr ""
+msgstr "Prejsť na Základný Editor a ručne zvoliť typ zákazu odbočenia"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:37
@@ -18792,8 +18831,14 @@
 "object."
 msgstr ""
+"<strong>Z</strong>-cesty <span class=\"object-name\">{0}</span> a "
+"<strong>na</strong>-cestu <span class=\"object-name\">{1}</span> pripojené v "
+"bode <span class=\"object-name\">{2}</span> ale <span class=\"object-name\">"
+"{2}</span> nie je <strong>via(cez)</strong>-objekt.<br> Je odporúčané "
+"nastaviť <span class=\"object-name\">{2}</span> ako jedinečný <strong>via"
+"(cez)</strong>-objekt."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:49
 msgid "Set via-Object"
-msgstr ""
+msgstr "Nastaviť \"via(cez)\"-Objekt"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:50
@@ -18802,8 +18847,9 @@
 "intersection"
 msgstr ""
+"Nahrádza aktuálne konfigurovaná \"via(cez)\"-objekty s bodom na križovatke"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/IntersectionMissingAsViaError.java:60
 msgid "Go to Basic Editor and manually fix the list of via-objects"
-msgstr ""
+msgstr "Prejsť na Základný Editor a opraviť ručne zoznam \"via(cez)\"-objektov"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingRestrictionTypeError.java:25
@@ -18812,28 +18858,30 @@
 "type in the Basic Editor."
 msgstr ""
+"Zákaz odbočenia musí deklarovať typ obmedzenia. Prosím, vyberte typ v "
+"Základnom Editore."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:36
 msgid "An OSM way with role <tt>from</tt> is required in a turn restriction."
-msgstr ""
+msgstr "OSM cesta s funkciou <tt>z</tt>, je potrebná v zákaze odbočenia."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:39
 msgid "An OSM way with role <tt>to</tt> is required in a turn restriction."
-msgstr ""
+msgstr "OSM cesta s funkciou <tt>na</tt>, je potrebná v zákaze odbočenia."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:42
 msgid "Please go to the Basic editor and manually choose an OSM way."
-msgstr ""
+msgstr "Choďte prosím do Základného editora a ručne vyberte OSM cestu."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:48
 msgid "Add in editor"
-msgstr ""
+msgstr "Pridať do editora"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:51
 msgid "Add an OSM way with role ''from''"
-msgstr ""
+msgstr "Pridať OSM cesty s funkciou ''z''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MissingTurnRestrictionLegError.java:54
 msgid "Add an OSM way with role ''to''"
-msgstr ""
+msgstr "Pridať OSM cesty s funkciou ''na''"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:37
@@ -18843,4 +18891,6 @@
 "turn restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Zákaz odbočenia vyžaduje presne jednu cestu s funkciou <tt>z</tt>. Tento "
+"zákaz odbočenia má {0} cesty v tejto funkcii. Prosím odstráňte {1} z nich."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:44
@@ -18850,8 +18900,10 @@
 "restriction has {0} ways in this role. Please remove {1} of them."
 msgstr ""
+"Zákaz odbočenia vyžaduje presne jednu cestu s funkciou <tt>na</tt>. Tento "
+"zákaz odbočenia má {0} cesty v tejto funkcii. Prosím odstráňte {1} z nich."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/MultipleTurnRestrictionLegError.java:57
 msgid "Go to the Advanced Editor and remove the members"
-msgstr ""
+msgstr "Prejdite na Pokročilý editor a odstráňte členov"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:25
@@ -18861,22 +18913,26 @@
 "recommended to use standard values for <tt>except</tt> only."
 msgstr ""
+"Tag <tt>okrem</tt> má neštandardnú hodnotu <tt>{0}</tt>. Odporúča sa "
+"používať len štandardné hodnoty pre <tt> okrem</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/NonStandardExceptWarning.java:34
 msgid "Go to Basic Editor and select standard vehicle type based exceptions"
 msgstr ""
+"Prejdite na Základný Editor a vyberte štandardný typ vozidla na základe "
+"výnimky"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:37
 #, java-format
 msgid "The required tag <tt>{0}={1}</tt> is missing."
-msgstr ""
+msgstr "Požadovaná značka <tt>{0}={1}</tt> chýba."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:45
 msgid "Add missing tag"
-msgstr ""
+msgstr "Pridať chýbajúcu značku"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/RequiredTagMissingError.java:46
 #, java-format
 msgid "Add the missing tag {0}={1}"
-msgstr ""
+msgstr "Pridať chýbajúcu značku {0}={1}"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:52
@@ -18888,12 +18944,15 @@
 "connects to way <span class=\"object-name\">{3}</span>."
 msgstr ""
+"OSM cesta <span class=\"object-name\">{0}</span> s funkciou <tt>{1}</tt> by "
+"mala byť rozdelená v bode <span class=\"object-name\">{2}</span>, kde sa "
+"napája na cestu <span class=\"object-name\">{3}</span>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:75
 msgid "Split now"
-msgstr ""
+msgstr "Teraz rozdeliť"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/TurnRestrictionLegSplitRequiredError.java:76
 msgid "Splits the way"
-msgstr ""
+msgstr "Rozdeliť cestu"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:45
@@ -18903,4 +18962,6 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Zákaz odbočenia používa body OSM <span class=\"object-name\">{0}</span> ako "
+"členov s funkciou <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:51
@@ -18910,4 +18971,6 @@
 "span> as member with role <tt>{1}</tt>."
 msgstr ""
+"Zákaz odbočenia používa relácie OSM <span class=\"object-name\">{0}</span> "
+"ako členov s funkciou <tt>{1}</tt>."
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:57
@@ -18917,9 +18980,9 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:63
 msgid "Delete the member from the turn restriction"
-msgstr ""
+msgstr "Vymazať člena z o zákazu odbočenia"
 
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/qa/WrongTurnRestrictionLegTypeError.java:81
 msgid "Change to the Basic Editor and select an OSM way"
-msgstr ""
+msgstr "Prejdite do Základného Editora a vyberte OSM cestu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:42
@@ -19201,5 +19264,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "multipolygón"
@@ -19207,29 +19270,29 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:37
 msgid "This test checks if multipolygons are valid"
-msgstr ""
+msgstr "Tento test kontroluje, či sú platné multipolygóny"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:105
 msgid "No outer way for multipolygon"
-msgstr ""
+msgstr "Chýba vonkajšia cesta multipolygónu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:118
 msgid "Multipolygon is not closed"
-msgstr ""
+msgstr "Multipolygón nie je uzavretý"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:140
 msgid "Multipolygon inner way is outside."
-msgstr ""
+msgstr "Vnútorná cesta multipolygónu je vonku."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:143
 msgid "Intersection between multipolygon ways"
-msgstr ""
+msgstr "Priesečník medzi cestami multipolygónu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:154
 msgid "No useful role for multipolygon member"
-msgstr ""
+msgstr "Žiadna platná funkcia pre člena multipolygónu"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:157
 msgid "Non-Way in multipolygon."
-msgstr ""
+msgstr "Multipolygón bez cesty."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:36
@@ -19243,4 +19306,7 @@
 "Italia - Italien - Italy."
 msgstr ""
+"Tento test zistí, viacjazyčné objekty, ktorých atribút 'meno' nie je rovnaký "
+"s niektorým 'menom: *' atribútu, a nie sú zložené z 'mena: *' atribútu, "
+"napr. Italia - Taliansko - Taliansko."
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NameMismatch.java:47
@@ -19516,5 +19582,5 @@
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:972
 msgid "Incorrect number of parameters"
-msgstr ""
+msgstr "Nesprávny počet parametrov"
 
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:990
@@ -19756,4 +19822,6 @@
 "discovered after download"
 msgstr ""
+"Nezrovnalosť v dátach stiahnutých ciest. Predchádzajúce pripojené cesty "
+"''{0}'' sa nemuseli objavil po prevzatí"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:183
@@ -19766,4 +19834,8 @@
 "continue way downloading?</html>"
 msgstr ""
+"<html>Nie sú ďalšie pripojené cesty na stiahnutie. <br>Bol zistený "
+"potenciálny duplicitný bod z  práve vybraných bodov, hoci. <br>Aktuálne "
+"vybraný bod je ''{0}''< br> Potenciály duplicitný bod je ''{1}''<br> Spojiť "
+"duplicitné body na aktuálne vybraný bod a pokračovať v sťahovaní? </ html>"
 
 #: ../plugins/waydownloader/src/org/openstreetmap/josm/plugins/waydownloader/WayDownloaderPlugin.java:196
@@ -19783,9 +19855,9 @@
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:47
 msgid "Way Select"
-msgstr ""
+msgstr "Way Select (výber cesty)"
 
 #: ../plugins/wayselector/src/org/openstreetmap/josm/plugins/wayselector/WaySelectorPlugin.java:46
 msgid "Select non-branching sequences of ways"
-msgstr ""
+msgstr "Vybrať nerozvetvené časti ciest"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:71
@@ -19795,5 +19867,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/Grabber.java:88
 msgid "Not in cache"
-msgstr ""
+msgstr "Nie je v cache pamäti"
 
 #: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:67
@@ -20005,5 +20077,5 @@
 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:457
 msgid "Set WMS Bookmark"
-msgstr ""
+msgstr "Nastaviť WMS Záložku"
 
 #: ../plugins/wmsplugin/src/wmsplugin/WMSPlugin.java:174
@@ -20126,5 +20198,5 @@
 #: build/trans_plugins.java:5
 msgid "Tools for drawing buildings."
-msgstr ""
+msgstr "Nástroje na kreslenie budov."
 
 #. Plugin cadastre-fr
@@ -20245,5 +20317,5 @@
 #: build/trans_plugins.java:39
 msgid "Simply convert an area to a multipolygon."
-msgstr ""
+msgstr "Jednoduché prevedenie oblasti na multipolygón."
 
 #. Plugin multipoly
@@ -20298,4 +20370,6 @@
 "right click menu of the image layer."
 msgstr ""
+"Napíšte GPS pozíciu do hlavičky súboru obrázka. Spustite túto funkciu z "
+"menu, kliknite pravým tlačidlom na obrázok vrstvy."
 
 #. Plugin PicLayer
@@ -20317,5 +20391,5 @@
 msgid ""
 "This plugin simplifies the mapping and editing of public transport routes."
-msgstr ""
+msgstr "Tento plugin zjednodušuje mapovanie a úpravy tratí verejnej dopravy."
 
 #. Plugin remotecontrol
@@ -20379,4 +20453,6 @@
 "to be running."
 msgstr ""
+"Kreslenie stavieb z Českej katastrálnej mapy. Vyžaduje spustený TracerServer "
+"(. NET alebo Mono)."
 
 #. Plugin turnrestrictions
@@ -20386,4 +20462,6 @@
 "the OpenStreetMap database."
 msgstr ""
+"Plugin zákaz odbočenia umožňuje vytvárať a upravovať obmedzenia v jazde v "
+"databáze OpenStreetMap."
 
 #. Plugin validator
@@ -20415,5 +20493,5 @@
 #: build/trans_plugins.java:87
 msgid "Select a sequence of non-branching connected ways"
-msgstr ""
+msgstr "Vyberte poradie nerozvetvených spojených ciest"
 
 #. Plugin wms-turbo-challenge2
@@ -20423,4 +20501,6 @@
 "behind."
 msgstr ""
+"Riadiť pretekárske auto z bodu A do bodu B cez letecký snímok, nechať za "
+"sebou kaktusy."
 
 #. Plugin wmsplugin
@@ -20548,7 +20628,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Ref. číslo"
@@ -20565,5 +20645,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Jazdné pruhy"
@@ -20581,4 +20661,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -20586,9 +20667,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. rýchlosť (km/h)"
@@ -20616,15 +20696,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -20635,11 +20709,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Jednosmerka"
@@ -20659,15 +20732,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -20684,11 +20755,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -20709,8 +20780,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -20728,11 +20799,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunel"
@@ -20752,6 +20823,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -20769,11 +20840,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Výkop"
@@ -20793,6 +20864,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -20810,11 +20881,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Násyp"
@@ -20952,19 +21023,22 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
-msgstr ""
+msgstr "Odovzdávacie miesta"
 
 #. item "Highways/Streets/Unclassified" text "Max. speed (km/h)"
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -20972,13 +21046,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Šírka (v metroch)"
@@ -21007,24 +21081,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Povrch"
@@ -21036,5 +21106,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -21048,11 +21118,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "spevnený"
@@ -21060,10 +21129,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "nespevnený"
@@ -21071,10 +21140,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr "asfalt"
@@ -21082,11 +21151,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "betón (concrete)"
@@ -21094,10 +21162,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "kov"
@@ -21105,10 +21173,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "drevo (wood)"
@@ -21116,10 +21184,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr "dlažobné kamene"
@@ -21127,11 +21195,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "dlažbová kocka (cobblestone)"
@@ -21139,10 +21206,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "štrk (gravel)"
@@ -21150,10 +21217,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr "riečne kamene"
@@ -21161,10 +21228,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr "zhutnená(valcovaná)"
@@ -21172,10 +21239,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr "trávový obkladač(grass_paver)"
@@ -21183,10 +21250,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "tráva (grass)"
@@ -21194,10 +21261,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "piesok (sand)"
@@ -21205,10 +21272,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "zem (ground)"
@@ -21289,6 +21356,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznámy typ)"
@@ -21297,5 +21363,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Upraviť cestu neznámeho typu"
@@ -21303,6 +21369,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Stavba"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Upraviť komunikáciu vo výstavbe"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Križovatka"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "kruhový objazd (roundabout)"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Cestné obmedzenie"
@@ -21311,15 +21406,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Upraviť cestné obmedzenie"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Mýto (Toll)"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Slepá ulica"
@@ -21327,5 +21422,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Prístup"
@@ -21367,28 +21462,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "áno"
@@ -21401,10 +21495,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -21418,10 +21512,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -21445,97 +21539,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "permissive (súhlas vlastníka pozemku)"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "farmársky (agricultural)"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
-msgstr ""
-
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+msgstr "lestníctvo"
+
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
-msgstr ""
+msgstr "doručenie"
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nie"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
-msgstr ""
-
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+msgstr "Poľnohospodársky"
+
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "určený"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
-msgstr ""
-
-#: build/trans_presets.java:361
+msgstr "oficiálny"
+
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Malé nákladná autá a dodávky"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Nákladné vozidlá"
@@ -21550,10 +21644,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Kôň"
@@ -21569,10 +21663,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motocykel"
@@ -21587,19 +21681,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Motorové vozidlo"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Dopravná obsluha"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. rýchlosť (km/h)"
@@ -21607,20 +21701,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. hmotnosť (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Max. Výška(v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Max. Šírka (v metroch)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Max. Dĺžka (v metroch)"
@@ -21628,5 +21722,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Kruhový objazd"
@@ -21637,5 +21731,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Upraviť kruhový objazd"
@@ -21655,10 +21749,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "dialnica (motorway)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "dialničná prípojka"
@@ -21680,10 +21774,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "cesta pre motorové vozidlá (trunk)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "prípojka cesty pre motorové vozidlá"
@@ -21705,10 +21799,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "cesta prvej triedy"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "prípojka cesty I. triedy"
@@ -21730,5 +21824,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -21743,9 +21837,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "cesta tretej triedy"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "cesta bez klasifikácie (unclassified)"
@@ -21759,9 +21853,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "obytná (osídlená)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "obytná zóna"
@@ -21791,10 +21885,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "obslužná (service)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "autobusová linka"
@@ -21824,5 +21918,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -21834,10 +21928,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Editácia mosta"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Upraviť Tunel"
@@ -21845,39 +21939,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Vedľajšie komunikácie"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Stavba"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Upraviť komunikáciu vo výstavbe"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Križovatka"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "kruhový objazd (roundabout)"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Poľná cesta (Track)"
@@ -21886,73 +21951,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Upraviť Stopu (Track)"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
-msgstr ""
+msgstr "Typ stopy"
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
-msgstr ""
-
-#: build/trans_presets.java:462
+msgstr "kvalita1"
+
+#: build/trans_presets.java:455
 msgid "grade2"
-msgstr ""
-
-#: build/trans_presets.java:462
+msgstr "kvalita2"
+
+#: build/trans_presets.java:455
 msgid "grade3"
-msgstr ""
-
-#: build/trans_presets.java:462
+msgstr "kvalita3"
+
+#: build/trans_presets.java:455
 msgid "grade4"
-msgstr ""
-
-#: build/trans_presets.java:462
+msgstr "kvalita4"
+
+#: build/trans_presets.java:455
 msgid "grade5"
-msgstr ""
-
-#: build/trans_presets.java:463 build/trans_presets.java:486
+msgstr "kvalita5"
+
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "turistika"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
-msgstr ""
+msgstr "MTB Rozsah"
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Cesta (chodník)"
@@ -21961,38 +21994,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Upraviť cestu (chodník)"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr "SAC Scale"
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "turistika"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr "horská_turistika"
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr "náročná_horská_turistika"
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr "vysokohorská_turistika"
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr "náročná_vysokohorská_turistika"
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr "ťažká_vysokohorská_turistika"
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
-msgstr ""
-
-#: build/trans_presets.java:488
+msgstr "vynikajúce"
+
+#: build/trans_presets.java:481
 msgid "good"
-msgstr ""
-
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+msgstr "dobré"
+
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "stredne pokročilý (intermediate)"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
-msgstr ""
-
-#: build/trans_presets.java:488
+msgstr "zlé"
+
+#: build/trans_presets.java:481
 msgid "horrible"
-msgstr ""
-
-#: build/trans_presets.java:492
+msgstr "hrozné"
+
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
+msgstr "Vozíky"
+
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Lyže"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snežný skúter"
@@ -22001,11 +22064,11 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
-msgstr ""
+msgstr "Vyhradená cesta pre kone"
 
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Upraviť cestu pre kone"
@@ -22013,7 +22076,7 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
-msgstr ""
+msgstr "Vyhradená cesta pre cyklistov"
 
 #. item "Ways/Dedicated Cycleway"
@@ -22029,11 +22092,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Upraviť cyklistickú cestu"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr "Pešia"
@@ -22041,34 +22104,30 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
-msgstr ""
+msgstr "Oddelený chodník - a cesta pre cyklistov"
 
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
-msgstr ""
+msgstr "Kombinivaný chodník - a cesta pre cyklistov"
 
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
-msgstr ""
+msgstr "Vyhradený chodník pre peších"
 
 #. item "Ways/Dedicated Footway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Upraviť chodník"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr "Bicykle"
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Schody"
@@ -22078,10 +22137,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Upraviť únikové schody"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Ďialničná križovatka"
@@ -22089,15 +22148,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Upraviť diaľničnú križovatku"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Číslo"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Služby"
@@ -22105,5 +22164,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Upraviť servisnú stanicu (autoservis)"
@@ -22143,17 +22202,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operátor"
@@ -22162,5 +22221,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -22170,5 +22229,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Typ prechodu pre chodcov"
@@ -22177,27 +22236,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "neriadený"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "semafor"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "ostrovček"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "neoznačený"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Prechod pre jazdcov na koňoch"
@@ -22205,6 +22264,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Prechod pre cyklistov"
@@ -22213,11 +22272,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "Prechod cez cestu s obsluhou"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Typy prechodov pre chodcov (UK viď. en.wikipedia.org)"
@@ -22225,31 +22284,31 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "prechod pre chodcov (zebra)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "prechod pre chodcov (len čiarkované okraje)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin (prechod pre chodcov a cyklistov, len čiarkované okraje)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 "pegasus (prechod pre chodcov a jazdcov na koňoch, len čiarkované okraje)"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger (prechod pre chodcov a cyklistov žlté pruhy)"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Zastaviť (stop)"
@@ -22257,5 +22316,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Prechod pre chodcov"
@@ -22264,14 +22323,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "Upraviť križovanie"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Typ mena (UK)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -22279,45 +22338,45 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
-msgstr ""
-
-#: build/trans_presets.java:676
+msgstr "naraziť"
+
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
-msgstr ""
-
-#: build/trans_presets.java:678
+msgstr "tabuľka"
+
+#: build/trans_presets.java:671
 msgid "Passing Place"
-msgstr ""
+msgstr "Odovzdávacie miesto"
 
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
-msgstr ""
+msgstr "Upraviť odovzdávacie miesto"
 
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Malý kruhový objazd"
@@ -22328,14 +22387,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Smer"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "v smere hodinových ručičiek (pravotočivý)"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Turning Circle (zaokrúhlený koniec cesty pre ľahšie otáčanie sa aut)"
@@ -22345,5 +22404,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Hranica mesta/obce"
@@ -22351,15 +22410,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Upraviť označenie hranice mesta/obce"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Druhé meno"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Kamera na meranie rýchlosti"
@@ -22368,5 +22427,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Núdzový telefón"
@@ -22374,5 +22433,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Sklon"
@@ -22380,5 +22439,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Prudký sklon"
@@ -22386,5 +22445,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -22394,10 +22453,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Brod"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Upraviť brod"
@@ -22405,5 +22464,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Horský priesmyk"
@@ -22411,5 +22470,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Upraviť horský priesmyk"
@@ -22421,7 +22480,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Nadmorská výška"
@@ -22429,5 +22488,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Prekážka (Barriers)"
@@ -22435,5 +22494,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Stĺpik"
@@ -22441,5 +22500,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Upraviť stĺpik"
@@ -22484,16 +22543,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Povolená prevádzka:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "Cyklo prekážka (Cycle Barrier)"
@@ -22502,5 +22561,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Balvan (Block)"
@@ -22508,5 +22567,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr ""
@@ -22516,5 +22575,5 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
@@ -22523,5 +22582,5 @@
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bus trap (rohož cez cestu zabraňujúca vjazdu vozidiel okrem autobusov)"
@@ -22529,15 +22588,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Špičky (hroty)"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Upraviť Hroty"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Mýtna búdka"
@@ -22545,5 +22604,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Upraviť mýtnu búdku"
@@ -22551,10 +22610,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Hraničná kontrola"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Upraviť hraničnú kontrolu"
@@ -22564,5 +22623,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Živý plot (Hedge)"
@@ -22573,22 +22632,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Plot"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
-msgstr ""
-
-#: build/trans_presets.java:821
+msgstr "plot"
+
+#: build/trans_presets.java:814
 msgid "wood_fence"
-msgstr ""
-
-#: build/trans_presets.java:821
+msgstr "drevený_plot"
+
+#: build/trans_presets.java:814
 msgid "wire_fence"
-msgstr ""
-
-#: build/trans_presets.java:823
+msgstr "drôtený_plot"
+
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Hradby"
@@ -22596,5 +22655,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Mestské hradby"
@@ -22603,5 +22662,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Oporný múr"
@@ -22613,10 +22672,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Vstup"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Upraviť vstup"
@@ -22624,5 +22683,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Brána"
@@ -22630,50 +22689,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Upraviť bránu"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Závora (Lift Gate)"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Upraviť závoru (Lift Gate)"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Brána pre zvieratá (Hampshire)"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Upraviť bránu pre zvieratá (hampshire)"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Brána pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Upraviť bránu pre otváranie predkom auta (bump)"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Automatická brána pre hospodárske zvieratá (Kissing)"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Upraviť automatickú bránu pre hosp. zvieratá (kissing)"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Turniket (Stile)"
@@ -22681,25 +22740,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Upraviť turniket"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Turniket"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Upraviť Turniket"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Sally port (vstupný portál do pevnosti s vonkajšou a vnútornou bránou)"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -22712,11 +22771,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Prameň"
@@ -22724,5 +22783,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Upraviť prameň"
@@ -22730,5 +22789,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Odvodňovací kanál, odtok"
@@ -22736,21 +22795,21 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Upraviť odvodňovací kanál, odtok"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
-msgstr ""
+msgstr "Priekopa"
 
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
-msgstr ""
+msgstr "Upraviť priekopu"
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Potok"
@@ -22758,10 +22817,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Upraviť potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Prieplav"
@@ -22769,10 +22828,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Upraviť prieplav"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Rieka"
@@ -22782,5 +22841,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Upraviť rieku"
@@ -22788,15 +22847,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Upraviť vodu"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Zem (Pevnina)"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Upraviť Zem (Pevnina)"
@@ -22804,15 +22863,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Basin (Kotvisko pre lode)"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Upraviť Basin (Kotvisko pre lode)"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Nádrž"
@@ -22820,15 +22879,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Upraviť nádrž"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Krytá nádrž"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Upraviť krytú nádrž"
@@ -22836,5 +22895,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Riečny breh"
@@ -22843,10 +22902,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Upraviť riečny breh"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Mokraď"
@@ -22857,14 +22916,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Upraviť mokraď"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "Močiar"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "slatina"
@@ -22878,35 +22937,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "močiar (marsh)"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "mokraď´s rákosím"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "soľná bažina"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "prílivová oblasť"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangrovová oblasť"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Blato"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Upraviť blato"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Pláž"
@@ -22914,20 +22973,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Upraviť pláž"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Záliv"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Upraviť záliv"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Útes"
@@ -22935,10 +22994,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Upraviť útes"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Pobrežie"
@@ -22946,5 +23005,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Upraviť pobrežie"
@@ -22952,5 +23011,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Prievoz, trajekt"
@@ -22958,5 +23017,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Upraviť prievoz, trajekt"
@@ -22965,5 +23024,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Lodenica"
@@ -22971,10 +23030,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Upraviť lodenicu"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dok, prístavná hrádza"
@@ -22982,5 +23041,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Upraviť dok, prístavnú hrádzu"
@@ -22988,5 +23047,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Priehrada, nádrž"
@@ -22994,15 +23053,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Upraviť priehradu, nádrž"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vodné objekty"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Plavebná komora"
@@ -23011,5 +23070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Priehradzka"
@@ -23017,20 +23076,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Upraviť priehradzku"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Vodopád"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Upraviť vodopád"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Turning Point (koniec cesty)"
@@ -23039,15 +23098,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Prístav (Marina)"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Upraviť Prístav (Marina)"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Mólo"
@@ -23055,10 +23114,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Upraviť mólo"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Prístavisko prievozu, trajektu"
@@ -23066,10 +23125,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Upraviť prístavisko prievozu, trajektu"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Slipway (rampa na vyzdvihnutie lode z vody na breh)"
@@ -23079,20 +23138,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Upraviť slipway (rampa na vyzdvihnutie lode z vody na breh)"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "Preprava"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Železnica (štandardná)"
@@ -23100,5 +23159,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Upraviť železničnú koľaj"
@@ -23128,86 +23187,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
-msgstr ""
+msgstr "rozmer (mm)"
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "štandartný"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -23219,10 +23203,10 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
-msgstr ""
+msgstr "Typy"
 
 #. item "Transport/Railway/Rail" combo "Types"
@@ -23234,31 +23218,31 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "železničná vlečka v závode"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "vedľajšia koľaj (napr: na stanici)"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "železničná vlečka"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
-msgstr ""
+msgstr "Elektrifikovaný"
 
 #. item "Transport/Railway/Rail" combo "Electrified"
@@ -23269,10 +23253,10 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
-msgstr ""
+msgstr "električkové_vedenie"
 
 #. color foot
@@ -23341,8 +23325,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -23354,8 +23338,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Napätie"
@@ -23368,10 +23352,10 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
-msgstr ""
+msgstr "Kmitočet (Hz)"
 
 #. item "Transport/Railway/Rail" combo "Frequency (Hz)"
@@ -23382,23 +23366,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
-msgstr ""
+msgstr "16.7"
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Úzkorozchodná železnica"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Upraviť úzkorozchodnú železnicu"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Jednokoľajka, vysutá dráha"
@@ -23406,50 +23390,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Upraviť jednokoľajku, vysutú dráhu"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Historická železnica"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Upraviť zachovanú železnicu (v prevádzke)"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Rýchloelektrička"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Upraviť električku"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Upraviť metro"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Električka"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Upraviť električku"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Autobusová linka"
@@ -23457,5 +23441,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Upraviť autobusovú linku"
@@ -23464,10 +23448,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Nepoužívaná železnica"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Upraviť nepoužívanú železnicu"
@@ -23476,9 +23460,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Voliteľné typy"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Opustená železnica"
@@ -23487,5 +23471,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Železničné priecestie"
@@ -23494,5 +23478,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Peší prechod cez železnicu"
@@ -23502,5 +23486,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Typy prechodov cez cestu"
@@ -23508,5 +23492,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Točňa"
@@ -23515,17 +23499,17 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
-msgstr ""
+msgstr "Nárazník"
 
 #. item "Transport/Railway/Buffer Stop"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Lanovka"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Sedačková lanovka"
@@ -23533,10 +23517,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Upraviť sedačkovú lanovku"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Lyžiarsky vlek Drag_lift(nepoužíva sa, použite piste:lift=platter)"
@@ -23544,5 +23528,5 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
@@ -23550,5 +23534,5 @@
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Kabínková lanovka"
@@ -23556,10 +23540,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Upraviť kabínkovú lanovku"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr "Gondola"
@@ -23567,10 +23551,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr "Upraviť Gondolu"
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -23579,5 +23563,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -23585,18 +23569,18 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
-msgstr ""
+msgstr "Stožiar"
 
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
-msgstr ""
+msgstr "Upraviť stožiar"
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Čerpacia stanica"
@@ -23606,62 +23590,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Upraviť čerpaciu stanicu"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Agip"
+
+#: build/trans_presets.java:1330
 msgid "Aral"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Aral"
+
+#: build/trans_presets.java:1330
 msgid "Avia"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Avia"
+
+#: build/trans_presets.java:1330
 msgid "BP"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "BP"
+
+#: build/trans_presets.java:1330
 msgid "Esso"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Esso"
+
+#: build/trans_presets.java:1330
 msgid "OMV"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "OMV"
+
+#: build/trans_presets.java:1330
 msgid "Q8"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Q8"
+
+#: build/trans_presets.java:1330
 msgid "Repsol"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Repsol"
+
+#: build/trans_presets.java:1330
 msgid "Shell"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Shell"
+
+#: build/trans_presets.java:1330
 msgid "Statoil"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Statoil"
+
+#: build/trans_presets.java:1330
 msgid "Tamoil"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Tamoil"
+
+#: build/trans_presets.java:1330
 msgid "Texaco"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Texaco"
+
+#: build/trans_presets.java:1330
 msgid "Total"
-msgstr ""
-
-#: build/trans_presets.java:1337
+msgstr "Total"
+
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -23719,32 +23703,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Otváracia doba"
@@ -23803,167 +23787,167 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr "Po-Pi 08:30-20:00"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr "Ut-Ne 08:00-15:00; So 08:00-12:00"
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr "Typy palív"
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr "Nafta"
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr "Bio nafta"
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr "Nafta pre ťažké nákladné automobily"
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr "Oktán 91"
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr "Oktán 95"
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr "Oktán 98"
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr "Oktán 100"
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr "E10 (10% Ethanol mix)"
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr "E85 (85% Ethanol mix)"
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr "LPG (Skvapalnený ropný plyn)"
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr "CNG (Stlačený zemný plyn)"
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr "1/25 mix (mofa/moped)"
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
-msgstr ""
+msgstr "1/50 mix (mofa/moped)"
 
 #. item "Car/Fuel" check "1/50 mix (mofa/moped)"
@@ -23978,5 +23962,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -23986,5 +23970,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Upraviť parkovisko"
@@ -23995,25 +23979,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referenčné číslo"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "mnohoposchodový"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "povrch"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "podzemie"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr "P+R parkovisko"
@@ -24022,48 +24006,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Poplatok"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr "Kapacita (celková)"
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Miesta pre vozíčkárov"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr "Priestory pre ženy"
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr "Priestory pre rodičov s detmi"
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr "Pozrite Wiki pre iné typy capacity:[types]=*."
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Umývačka"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Upraviť umývačku aut"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Servis"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Upraviť autoservis"
@@ -24071,5 +24055,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Požičovňa"
@@ -24078,10 +24062,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Upraviť autopožičovňu"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Autopožičovňa (aj pre krátkodobé požičanie auta aj 1 hod.)"
@@ -24089,5 +24073,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Upraviť autopožičovňu (aj pre krátkodobé požičanie auta aj 1hod.)"
@@ -24095,10 +24079,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Upraviť parkovisko bicyklov"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapacita"
@@ -24107,10 +24091,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Upraviť požičovňu bicyklov"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -24120,5 +24104,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -24126,5 +24110,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Reference"
@@ -24132,5 +24116,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Železničná zastávka"
@@ -24138,5 +24122,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Upraviť zastávku"
@@ -24144,5 +24128,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Zastávka električky"
@@ -24151,5 +24135,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Upraviť zastávku električky"
@@ -24157,5 +24141,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Železničné nástupište"
@@ -24164,5 +24148,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Upraviť železničné nástupište"
@@ -24174,5 +24158,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Referencie (číslo stopy(track))"
@@ -24180,10 +24164,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Oblasť"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Vchod do metra"
@@ -24192,10 +24176,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Upraviť vchod do metra"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Invalidný vozík"
@@ -24204,5 +24188,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Autobusová stanica"
@@ -24211,5 +24195,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Upraviť autobusovú stanicu"
@@ -24217,5 +24201,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Autobusová zastávka"
@@ -24225,5 +24209,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Upraviť autobusovú zastávku"
@@ -24232,6 +24216,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Prístrešok"
@@ -24239,19 +24223,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Lavička"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
-msgstr ""
+msgstr "Hmatové Dlažby"
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Autobusové nástupište"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Upraviť autobusové nástupište"
@@ -24259,5 +24243,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -24265,5 +24249,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Upraviť stanicu taxíkov"
@@ -24271,27 +24255,27 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Letisko"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
-msgstr ""
+msgstr "Letisko, pozemné"
 
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
-msgstr ""
+msgstr "Upraviť pozemné letisko"
 
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -24300,37 +24284,37 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
-msgstr ""
+msgstr "Pristávacia dráha"
 
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
-msgstr ""
+msgstr "Upraviť pristávaciu dráhu"
 
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
-msgstr ""
+msgstr "Rolovacie dráhy"
 
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
-msgstr ""
+msgstr "Upraviť rolovacie dráhy"
 
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
-msgstr ""
+msgstr "Pristávacia plocha pre vrtuľníky"
 
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
-msgstr ""
+msgstr "Upraviť pristávaciu plochu pre vrtuľníky"
 
 #. item "Airport/Helipad" text "Reference"
@@ -24338,7 +24322,7 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
-msgstr ""
+msgstr "Pristávacia plocha"
 
 #. item "Airport/Apron" label "Apron"
@@ -24346,7 +24330,7 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
-msgstr ""
+msgstr "Hangár"
 
 #. item "Airport/Hangar" label "Hangar"
@@ -24355,6 +24339,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Signál (rádiomaják)"
@@ -24364,34 +24348,34 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
-msgstr ""
+msgstr "Veterný rukáv"
 
 #. item "Airport/Windsock" label "Windsock"
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
-msgstr ""
+msgstr "Terminál"
 
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
-msgstr ""
+msgstr "Upraviť terminál"
 
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
-msgstr ""
+msgstr "Upraviť terminál"
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Cestovanie"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Ubytovanie"
@@ -24403,5 +24387,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -24410,15 +24394,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Upraviť hotel"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Hviezdičkový"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -24426,20 +24410,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Upraviť motel"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Penzión"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Upraviť penzión"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Chata"
@@ -24447,10 +24431,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Upraviť chatu"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Ubytovňa"
@@ -24458,30 +24442,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Upraviť ubytovňu"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Horská chata"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Upraviť horskú chatu"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Upraviť kemping pre obytné prívesy"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Stanový tábor"
@@ -24489,10 +24473,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Upraviť stanový tábor"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Jedlo + Pitie"
@@ -24503,5 +24487,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Reštaurácia"
@@ -24509,5 +24493,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Upraviť reštauráciu"
@@ -24515,5 +24499,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Kuchyňa"
@@ -24521,73 +24505,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "talianska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "čínska"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "grécka"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "nemecká"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indická"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "regionálna"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turecká"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "ázijská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thajská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexická"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japonská"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
-msgstr ""
-
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+msgstr "sendvič"
+
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
-msgstr ""
-
-#: build/trans_presets.java:1645
+msgstr "sushi"
+
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Rýchle občerstvenie"
@@ -24595,17 +24579,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Upraviť reštauráciu rýchleho občerstvenia"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
-msgstr ""
-
-#: build/trans_presets.java:1653
+msgstr "kura"
+
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kaviareň"
@@ -24613,9 +24597,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Upraviť kaviareň"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Krčma"
@@ -24623,18 +24607,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Upraviť krčmu"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Záhradná reštaurácia"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Upraviť záhradnú reštauráciu"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "Bar (výčap)"
@@ -24642,9 +24626,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "Upraviť bar (výčap)"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nočný klub"
@@ -24652,24 +24636,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Upraviť nočný klub"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turistika"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Atrakcia"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Upraviť atrakciu"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Múzeum"
@@ -24677,9 +24661,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Upraviť múzeum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -24688,9 +24672,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Upraviť zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Výhliadka"
@@ -24698,24 +24682,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Upraviť výhliadku"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Výhliadková veža"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Zábavný park"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Edit Theme Park"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Umelecké dielo"
@@ -24723,5 +24707,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Upraviť umelecké dielo"
@@ -24729,19 +24713,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "Informačná kancelária"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "Mapa"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr "Úroveň detailu"
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr "topografická"
@@ -24779,5 +24763,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -24785,28 +24769,28 @@
 msgstr "pouličná sieť"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr "prehľadová (oreintačná)"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr "Zobrazená oblasť"
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr "miesto (blízke okolie)"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "mesto (city)"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr "oblasť (region)"
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr "Bližší popis"
@@ -24816,5 +24800,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Zobrazené cesty sú pre:"
@@ -24822,5 +24806,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Turistika"
@@ -24828,6 +24812,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cyklistika"
@@ -24835,5 +24819,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr "Horský bicykel"
@@ -24841,6 +24825,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Lyžovanie"
@@ -24848,5 +24832,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr "Jazdectvo"
@@ -24854,46 +24838,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr "... iný druh prepravy"
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Informačná tabuľa"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr "Informačný panel s radami (board content)"
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr "upozornenie"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "história"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "príroda"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "divoká príroda"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr "závod"
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr "Rázcestník (ukazovateľ smeru)"
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr "Informačný terminál"
@@ -24901,29 +24885,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr "Bližší popis"
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr "Audiosprievodcovia"
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr "Audiosprievodcovia cez mobilný telefón?"
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "Číslo telefónu"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "Ostatné (iné) informačné body (miesta)"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Upraviť prístrešok"
@@ -24931,25 +24915,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Ohnisko"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Výletné miesto"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Upraviť výletné miesto"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historické miesta"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Hrad"
@@ -24958,19 +24942,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Upraviť hrad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Zrúcanina"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Upraviť zrúcaninu"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Archeologické nálezisko"
@@ -24979,9 +24963,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Upraviť archeologické nálezisko"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Bojisko"
@@ -24989,10 +24973,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Upraviť bojisko"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Palaeontological Areál"
@@ -25000,5 +24984,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Upraviť Palaeontological Areál"
@@ -25006,15 +24990,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Upraviť pamätihodnosť, pamätník"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Pomník"
@@ -25022,55 +25006,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Upraviť pomník"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Upraviť kríž pri ceste"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Božia muka"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Upraviť božiu muku"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr "Hraničné kamene"
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr "Upraviť hraničné kamene"
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Voľný čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vodný zábavný park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Upraviť vodný zábavný park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Ihrisko"
@@ -25078,35 +25062,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Upraviť ihrisko"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Rybolov"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Upraviť rybolov"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Športy"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Športové zariadenie"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Štadión"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Upraviť štadión"
@@ -25120,6 +25104,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "vyberte šport:"
@@ -25511,6 +25495,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -25544,68 +25528,68 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "multi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lukostreľba"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australian_football"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boules (spoločný názov pre hry hrajuce sa s kovovými guľami)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 "bowls (gúľanie šišatej gule po umelej,alebo prírodnej tráve k malej guľke)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanoe"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "lezenie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 "kriketová tréningová plocha s ochrannými sieťami (pre pálkára a nadhadzovača)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
@@ -25613,160 +25597,160 @@
 "trávnika)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "bicyklovanie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "závody chrtov"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "jazdectvo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "americký futbal"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "konské dostihy"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "automobilový"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "racquetbal (podobné ako squash, iné pravidlá)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "ragby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "streľba"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "korčuľovanie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "lyžovanie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futbal (soccer)"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plávanie"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "stolný tenis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Športové centrum"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Upraviť športové centrum"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Hracia plocha, ihrisko"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Upraviť hraciu plochu, ihrisko"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Dostihová dráha"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Upraviť dostihovú dráhu"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfové ihrisko"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Upraviť golfové ihrisko"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Upraviť minigolf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Multi"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Upraviť Multi"
@@ -25805,21 +25789,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "typ"
@@ -25858,203 +25842,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "hracia plocha, ihrisko"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "športové centrum"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "štadión"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr "stopa"
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin (Kolok na hru s desiatimi kolkami)"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "Upraviť 10pin (kolok na hru s desiatimi kolkami)"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletika"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Upraviť atletiku"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lukostreľba"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Upraviť lukostreľbu"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Lezenie"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Upraviť lezenie"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanoistika"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Upraviť kanoistiku"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Upraviť cyklistiku"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Preteky chrtov"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Upraviť preteky chrtov"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Jazdectvo"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Upraviť jazdectvo"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Konské dostihy"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Upraviť konské dostihy"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Upraviť turistiku"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motošport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Upraviť motošport"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Korčuľovanie"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Upraviť korčuľovanie"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Upraviť Skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plávanie"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Upraviť plávanie"
@@ -26062,52 +26046,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Upraviť lyžovanie"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Typ lyžiarskej dráhy"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "zjazdárska"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "beh nalyžiach hore kopcom (nordic)"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr "park zimných športov"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Obtiažnosť"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "pre začiatočníkov"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "ľahká"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "pokročilý (advanced)"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "pre skúsených"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "freeride (zjazd na horských bicykloch cez prekážky)"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Streľba"
@@ -26115,177 +26099,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Upraviť streľbu"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Šport (loptový)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Futbal"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Upraviť futbal"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Americký futbal"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Upraviť americký futbal"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australian Football"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Upraviť Australian Football"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Bejzbal"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Upraviť bejzbal"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbal"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Upraviť basketbal"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Upraviť golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golfové ihrisko"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Bowling na tráve"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Upraviť bowling na tráve"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Upraviť bowling"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kriket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Upraviť kriket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cvičné ihrisko pre kriket so sieťou"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Upraviť cvičné ihrisko pre kriket so sieťou"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Croquet"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Upraviť kroquet"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Upraviť hokej"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Upraviť polotu"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Racquetbal"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Upraviť racquetbal"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Ragby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Upraviť ragby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Stolný tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Upraviť stolný tenis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Upraviť tenis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "Človekom-Vytvorené (Man-Made)"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Budova"
@@ -26293,5 +26277,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Verejná budova"
@@ -26299,10 +26283,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Upraviť verejnú budovu"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Radnica (obecný úrad)"
@@ -26310,10 +26294,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Upraviť radnicu (obecný úrad)"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Veľvyslanectvo"
@@ -26321,10 +26305,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Upraviť veľvyslanectvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Súd"
@@ -26333,10 +26317,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Vezenie"
@@ -26345,10 +26329,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Upraviť súd"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polícia"
@@ -26358,10 +26342,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Upraviť políciu"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Hasičská stanica"
@@ -26370,10 +26354,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Upraviť hasičskú stanicu"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -26381,5 +26365,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Upraviť poštu"
@@ -26387,15 +26371,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Škôlka"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Upraviť škôlku"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Škola"
@@ -26403,10 +26387,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Upraviť školu"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Univerzita"
@@ -26414,10 +26398,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Upraviť Univerzitu"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Vysoká škola"
@@ -26425,5 +26409,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Upraviť vysokú školu"
@@ -26431,5 +26415,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kino"
@@ -26438,10 +26422,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Upraviť kino"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knižnica"
@@ -26450,9 +26434,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Upraviť knižnicu"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Kultúrne stredisko"
@@ -26460,10 +26444,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Upraviť kultúrne stredisko"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Divadlo"
@@ -26472,10 +26456,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Upraviť divadlo"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kostol"
@@ -26485,5 +26469,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Upraviť kostol"
@@ -26492,6 +26476,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Náboženstvo"
@@ -26500,66 +26484,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "baháisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budhisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "kresťania"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "džinisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judaisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "moslimovia"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoisti"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr "unitársky"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Vyznanie (cirkevné)"
@@ -26568,81 +26552,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikánska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptistická"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katolícka"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evanjelikánska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "svedkovia jehovovi"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "lutheránska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "methodistická"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormónska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodoxná"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbiteriánska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestanská"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quakerská"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "šiítska"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnitská"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresy"
@@ -26651,5 +26635,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Upraviť informácie o adrese"
@@ -26657,5 +26641,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Číslo domu"
@@ -26663,25 +26647,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Meno domu"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Názov ulice"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Názov mesta"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštové smerovacie číslo"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Kód krajiny"
@@ -26690,5 +26674,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Upraviť interpoláciu adries"
@@ -26696,61 +26680,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Schéma číslovania"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "nepárne"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "párne"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "abecedný"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Človekom vytvorené (Man made)"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Závody (továrne)"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Upraviť závody (továrne)"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Veža"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Upraviť vežu"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr "Typ veže"
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "telekomunikačná"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "pozorovateľňa"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "Výška (metre)"
@@ -26758,25 +26742,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodojem"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Upraviť vodojem"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Plynojem (Gasometer)"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Upraviť plynojem (gasometer)"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Maják"
@@ -26784,10 +26768,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Upraviť maják"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Veterný mlyn"
@@ -26795,10 +26779,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Upraviť veterný mlyn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Potrubie"
@@ -26807,41 +26791,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Upraviť potrubie"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "plynová"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr "teplo(heat)"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr "ropa(oil)"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr "splašky(sewage)"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr "nejaké látky(any substance)"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Umiestnenie"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr "podvodné(underwater)"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr "nadzemné(overground)"
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistička odpadových vôd"
@@ -26851,10 +26835,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Upraviť čističku odpadových vôd"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Žeriav"
@@ -26862,5 +26846,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Upraviť žeriav"
@@ -26868,10 +26852,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Upraviť signál (rádiomaják)"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Meračský bod"
@@ -26879,10 +26863,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Upraviť meračský bod"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Pozorovanie (ostraha)"
@@ -26890,23 +26874,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Upraviť pozorovaciu kameru"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
-msgstr ""
-
-#: build/trans_presets.java:2389
+msgstr "vnútorný"
+
+#: build/trans_presets.java:2382
 msgid "outdoor"
-msgstr ""
-
-#: build/trans_presets.java:2389
+msgstr "vonkajší"
+
+#: build/trans_presets.java:2382
 msgid "public"
-msgstr ""
+msgstr "verejný"
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Elektráreň (spôsob vyroby)"
@@ -26916,35 +26900,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Upraviť elektráreň (spôsob vyroby)"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "veterná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vodná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fosílna"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "jadrová"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "uhoľná"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "fotovoltanická (slnečná články)"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Transformátorová stanica"
@@ -26953,10 +26937,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Upraviť trafostanicu"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Malý transformátor"
@@ -26965,5 +26949,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Upraviť malý transformátor"
@@ -26971,10 +26955,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "Odkazová linka"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Elektrický stožiar (vysoké napätie)"
@@ -26985,23 +26969,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Upraviť elektrický stožiar"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr "veža"
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr "stožiar(pole)"
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr "Nastavenie veže"
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Elektrické vedenie"
@@ -27010,74 +26994,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Upraviť elektrické vedenie"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr "Typ vedenia"
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr "vedenie"
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr "vedľajšie_vedenie"
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr "Počet káblov"
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr "Počet vodičov (lepší: vodič) pre napájacie káble"
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr "jedno"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr "dvojité"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr "trojité"
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr "štvorité"
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Vybavenosť (Amenities)"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toalety"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
-msgstr ""
+msgstr "omedzený"
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Poznámka"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Poštová schránka"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefón"
@@ -27086,5 +27070,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Upraviť telefón"
@@ -27092,5 +27076,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mince"
@@ -27098,5 +27082,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Bankovky"
@@ -27104,5 +27088,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Platobné karty a Kreditné karty"
@@ -27110,5 +27094,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debetné karty"
@@ -27116,15 +27100,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditné karty"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefónne karty"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recyklácia"
@@ -27133,5 +27117,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Upraviť recykláciu (zber)"
@@ -27139,74 +27123,74 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batérie"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Plechovky"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Handry"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Sklo"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papier"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Železný šrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
-msgstr ""
+msgstr "Odpadkový kôš"
 
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
-msgstr ""
+msgstr "Upraviť odpadkový kôš"
 
 #. item "Amenities/Bench"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr "Oreradlo chrbta (Backrest)"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "Materiál"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "kameň"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "plast"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "Farba"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "čierna"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "hnedá"
@@ -27285,5 +27269,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -27293,31 +27277,31 @@
 msgstr "zelená"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "červená"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "modrá"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "šedá"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "biela"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "Počet sedadiel"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Poľovnícky posed"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Upraviť poľovnícky posed"
@@ -27326,30 +27310,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Výška"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "nízky"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "polovičný"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "úplný"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Skryť"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Zamknúť"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontána"
@@ -27358,10 +27342,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Upraviť fontánu"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Pitná voda"
@@ -27370,23 +27354,23 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Upraviť pitnú vodu"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
-msgstr ""
+msgstr "Hydrant"
 
 #. item "Amenities/Fire Hydrant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
-msgstr ""
+msgstr "Upraviť hydrant"
 
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Hniezdo záchrany"
@@ -27394,56 +27378,56 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Upraviť hniezdo záchrany"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Obchody"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
-msgstr ""
+msgstr "Obchod s autami"
 
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Upraviť obchod s autami"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
-msgstr ""
+msgstr "Bicyklový obchod"
 
 #. item "Shops/Bike Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Upraviť bicyklový obchod"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Upraviť supermarket"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Lekáreň"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Upraviť lekáreň"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Obchod s polotovarmi"
@@ -27451,9 +27435,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Upraviť obchod s polotovarmi"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Stánok"
@@ -27461,27 +27445,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Upraviť stánok"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Kníhkupectvo"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Upraviť kníhkupectvo"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Cestovná kancelária"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Upraviť cestovnú kanceláciu"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Mäsiareň"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Upraviť mäsiarstvo"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Chlieb a pečivo"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Upraviť chlieb a pečivo"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Kvetinárstvo"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Upraviť kvetinárstvo"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "Biopotraviny"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "Upraviť biopotraviny"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Upraviť Obchod s alkoholickými nápojmi"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Nápoje"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "Upraviť Obchod s nápojmi."
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Počítač"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Upraviť počítačový obchod"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronika"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Upraviť obchod s elektronikou"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Upraviť obchod s Hifi elektronikou"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Nábytok"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Upraviť obchod s nábytkom"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Záhradné centrum"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Upraviť záhradné centrum"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Železiarstvo"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Upraviť železiarstvo"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Obchod Urob si sám"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Upraviť obchod Urob si sám"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Papierníctvo"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Upraviť papierníctvo"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Kaderníctvo"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Upraviť kaderníctvo"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Obuva"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Upravit obchod s obuvou"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Hračky"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Upraviť obchod s hračkami"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Obchod s DVD"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Upraviť obchod s DVD"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Chemická čistiareň"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Upraviť chemickú čistiareň"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Práčovňa"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Upraviť práčovňu"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Turistický (Outdoor)"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Upraviť športový obchod"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optik"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Upraviť očnú optiku"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Predajný automat"
@@ -27489,5 +27687,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Upraviť predajný automat"
@@ -27495,306 +27693,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Predávané výrobky"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "lístky MHD"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "plány MHD"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkovacie lístky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "jedlo"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "pitie"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "sladkosti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigarety"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "krmivo pre zvieratá"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "noviny"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "hračky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "známky"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-karty"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefónne kupóny (poukážky)"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "kupóny (poukážky)"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bicykel"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondómy"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampóny"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "sáčky na výkaly"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "Prístupové alebo vernostné karty"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Mäsiareň"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Upraviť mäsiarstvo"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Chlieb a pečivo"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Upraviť chlieb a pečivo"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Kvetinárstvo"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Upraviť kvetinárstvo"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "Biopotraviny"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "Upraviť biopotraviny"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Upraviť Obchod s alkoholickými nápojmi"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Nápoje"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "Upraviť Obchod s nápojmi."
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Počítač"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Upraviť počítačový obchod"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronika"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Upraviť obchod s elektronikou"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Upraviť obchod s Hifi elektronikou"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Nábytok"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Upraviť obchod s nábytkom"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Záhradné centrum"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Upraviť záhradné centrum"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Železiarstvo"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Upraviť železiarstvo"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Obchod Urob si sám"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Upraviť obchod Urob si sám"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Papierníctvo"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Upraviť papierníctvo"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Kaderníctvo"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Upraviť kaderníctvo"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Obuva"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Upravit obchod s obuvou"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Hračky"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Upraviť obchod s hračkami"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Obchod s DVD"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Upraviť obchod s DVD"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Chemická čistiareň"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Upraviť chemickú čistiareň"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Práčovňa"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Upraviť práčovňu"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Turistický (Outdoor)"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Upraviť obchod s výchádzkovým (outdoor) tovarom"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Upraviť športový obchod"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optik"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Upraviť očnú optiku"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Hotovosť"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banka"
@@ -27802,14 +27792,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Upraviť banku"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Zmenáreň"
@@ -27817,5 +27807,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Upraviť zmenáreň"
@@ -27823,15 +27813,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Upraviť bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Zdravie"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Lekári"
@@ -27839,18 +27829,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Upraviť lekárov"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Zubný lekár"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Upraviť zubného lekára"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Lekáreň"
@@ -27858,5 +27848,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Upraviť lekáreň"
@@ -27864,9 +27854,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "výdaj na recepty"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Nemocnica"
@@ -27874,10 +27864,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Upraviť nemocnicu"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Pohotovosť (Záchranná služba)"
@@ -27886,5 +27876,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Upraviť pohotovosť (záchrannú službu)"
@@ -27893,20 +27883,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Číslo bodu"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr "Meno bodu(miesta)"
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefónne číslo"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Použite medzinárodný kód, ako +12-345-67890)"
@@ -27914,5 +27904,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinár"
@@ -27921,64 +27911,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Upraviť veterinárnu ambulanciu"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografia(Zemepis)"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Miesta"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Upraviť kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Krajina (štát)"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Upraviť krajinu (štát)"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Stav"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Upraviť štát"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Oblasť (región)"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Upraviť oblasť (región)"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "kraj (okres)"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Upraviť kraj (okres)"
@@ -27986,15 +27976,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Mesto (city)"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Mesto (town)"
@@ -28002,10 +27992,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Upraviť mesto"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Štvrť"
@@ -28013,25 +28003,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Upraviť štvrť"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Dedina"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Upraviť dedinu"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Malá dedina / osada / samota"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Upraviť malú dedinu"
@@ -28039,5 +28029,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Oblasť (lokalita)"
@@ -28045,10 +28035,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Upraviť oblasť (lokalitu)"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ostrov"
@@ -28056,10 +28046,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Upraviť Ostrov"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Ostrovček"
@@ -28067,5 +28057,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Upraviť ostrovček"
@@ -28073,5 +28063,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Vstup do jaskyne"
@@ -28079,10 +28069,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Upraviť vstup do jaskyne"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Vrchol"
@@ -28090,10 +28080,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Upraviť vrchol kopca"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Ľadovec"
@@ -28101,10 +28091,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Upraviť ľadovec"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Sopka"
@@ -28112,70 +28102,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Upraviť sopku"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Hranice"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Štátna"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Upraviť štátne hranice"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administratívne"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Upraviť administratívne hranice"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Občianske"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Upraviť občiansku hranicu"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politická"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Upraviť politickú hranicu"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Národný park"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Upraviť hranicu Národného parku (prírodnej rezervácie)"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Využívanie oblasti (Land use)"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Strom"
@@ -28184,15 +28174,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Upraviť strom"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botanický názov"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Drevo"
@@ -28201,5 +28191,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Upraviť Drevo"
@@ -28207,17 +28197,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "ihličnatý"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "listnatý"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "zmiešaný"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Les"
@@ -28226,14 +28216,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Upraviť les"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Prírodná rezervácia"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Upraviť prírodnú rezerváciu"
@@ -28241,25 +28231,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Sutina"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Upraviť sutinu"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Krovie"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Upraviť krovie"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Fell (typ horskej krajiny nad pásmom stromov (horská pastvina))"
@@ -28267,5 +28257,5 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
@@ -28273,5 +28263,5 @@
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Vresovisko"
@@ -28279,5 +28269,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Upraviť vresovisko"
@@ -28285,5 +28275,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Farma"
@@ -28292,45 +28282,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Upraviť farmu"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Poľnohospodárska pôda"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Upraviť poľnohospodárske pôdu"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Lúka"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Upraviť lúku"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vinica"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Upraviť vinicu"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Ťažobný priestor"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Upraviť ťažobný priestor"
@@ -28338,25 +28328,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Záhrada"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Upraviť záhradu"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Tráva"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Upraviť trávnatú plochu"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Obecná zeleň"
@@ -28364,10 +28354,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Upraviť obecnú zeleň"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Spoločné, obecné"
@@ -28375,20 +28365,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Upraviť spoločné, obecné"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Upraviť park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Rekreačná oblasť"
@@ -28396,5 +28386,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Upraviť rekreačnú oblasť"
@@ -28402,15 +28392,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Osídlená oblasť (Residential area)"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Upraviť osídlenú oblasť"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Cintorín (malý, blizko kostola)"
@@ -28418,9 +28408,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Upraviť cintorín (malý, blizko kostola)"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Cintorín"
@@ -28428,39 +28418,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Upraviť cintorín"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Maloobchod"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Upraviť oblasť s maloobchodmi"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Obchodná (komerčná)"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Upraviť obchodnú (komerčnú) oblasť"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Priemysel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Upraviť priemyselnú oblasť"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Železničný pozemok"
@@ -28468,15 +28458,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Upraviť železničný pozemok"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Armáda"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Upraviť vojenskú oblasť"
@@ -28484,50 +28474,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Stavebná oblasť"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Upraviť stavebnú oblasť"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Upraviť brownfield (opustený priemyselný objekt)"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "Upraviť greenfield (oblasť používaná pre poľnohospodárstvo)"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Skládka odpadov"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Upraviť skládku odpadov"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Lom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Upraviť lom"
@@ -28537,5 +28527,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Upraviť multipolygón"
@@ -28544,10 +28534,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "obvodová časť (outer segment)"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "vnútorná časť (inner segment)"
@@ -28555,5 +28545,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr "Prikázané smery jazdy (turn restriction)"
@@ -28562,5 +28552,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr "Upraviť prikázané smery jazdy (turn restriction)"
@@ -28568,34 +28558,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Obmedzenie"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "zákaz zabočenia vľavo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "zákaz zabočenia vpravo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "zákaz jazdy priamo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "zákaz otáčania sa"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "prikázané odbočenie vpravo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "prikázané odbočenie vľavo"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "zákaz odbočenia"
@@ -28604,15 +28594,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "z cesty"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "cez bod alebo cestu"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "k ceste"
@@ -28620,5 +28610,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Cesta (Route)"
@@ -28627,5 +28617,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Upraviť Cestu (Route)"
@@ -28633,5 +28623,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Typ Cesty (Route)"
@@ -28722,5 +28712,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -28730,17 +28720,17 @@
 msgstr "bicykel"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "autobus"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "cesta (vozovka)"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "trajekt (prievoz)"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr "lyžovanie"
@@ -28800,5 +28790,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -28807,9 +28797,9 @@
 msgstr "pešia (foot)"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr "električka"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr "obchádzka"
@@ -28823,10 +28813,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro (subway)"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr "Popis značky"
@@ -28834,31 +28824,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "Sieť"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr "Štátna cesta"
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr "plánovaný"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr "náhradný"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr "dočasný"
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr "spojenie"
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr "Farba (hex)"
@@ -28867,32 +28857,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr "cestný úsek"
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr "predný segment"
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr "zadný segment"
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr "bod prerušenia"
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr "predný bod prerušenia"
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr "zadný bod prerušenia"
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "štandartný"
 
 #. mappaint style named "standard"
@@ -32915,4 +32980,7 @@
 msgid "Sicily - Italy"
 msgstr "Sicily - Italy"
+
+#~ msgid "Bikes"
+#~ msgstr "Bicykle"
 
 #~ msgid "Move"
Index: /applications/editors/josm/i18n/po/sl.po
===================================================================
--- /applications/editors/josm/i18n/po/sl.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/sl.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 21:04+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:27+0000\n"
 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
 "Language-Team: Slovenian <sl@li.org>\n"
@@ -17,5 +17,5 @@
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:53+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1185,5 +1185,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Predmetov ni možno prestaviti s tega sveta."
@@ -1496,5 +1496,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2245,9 +2245,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2330,26 +2330,26 @@
 msgstr "Zaključi risanje."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Izrini"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Ustvari površine"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Izrini pot"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Narišite kvadrat poljubne velikosti, nato izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2367,6 +2367,6 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2378,9 +2378,9 @@
 msgstr "Izberite"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Izberi, premakni ali zasuči predmete"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2389,17 +2389,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Premakni elemente"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Premakni jih"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Razveljavi premik"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2409,9 +2409,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Za izbor predmetov v pravokotniku izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2420,9 +2420,9 @@
 "najbližjo točko."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Za prenehanje vrtenja izpustite miškin gumb."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3139,5 +3139,5 @@
 msgstr "Uveljavim?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3717,12 +3717,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Naloži izbrano"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Ni slike"
+msgstr ""
 
 #. teal
@@ -3903,5 +3901,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "železnica"
@@ -5180,5 +5178,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr ""
@@ -5593,4 +5591,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5681,5 +5684,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relacije"
@@ -5781,14 +5784,14 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr ""
@@ -6118,4 +6121,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6128,10 +6137,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6801,145 +6804,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Naziv"
@@ -8158,10 +8161,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Vrsta"
@@ -8169,5 +8172,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8181,17 +8183,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "neznan"
@@ -8956,11 +8957,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8977,14 +8980,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Plast"
@@ -9517,5 +9520,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Opis"
@@ -10572,55 +10575,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11093,5 +11096,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Avtomobil"
@@ -11113,16 +11116,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Kolo"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11152,12 +11156,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr ""
@@ -11855,12 +11859,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Ime ceste"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Izmerjene vrednosti"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14111,6 +14113,7 @@
 msgstr "Pošiljanje sledi"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14201,5 +14204,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Interpolacija naslovov"
@@ -14386,5 +14389,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14425,19 +14428,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Zgradbe"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14445,5 +14448,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14456,10 +14459,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14642,5 +14645,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16460,5 +16463,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Javni prevoz"
@@ -16510,5 +16513,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr ""
@@ -17079,4 +17082,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Vrsta"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17233,4 +17253,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Izbriši izbrano relacijo"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -17987,5 +18020,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19255,7 +19288,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr ""
@@ -19272,5 +19305,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Voznih pasov"
@@ -19288,4 +19321,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19293,9 +19327,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Najvišja hitrost (km/h)"
@@ -19323,15 +19356,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19342,11 +19369,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Enosmerna"
@@ -19366,15 +19392,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19391,11 +19415,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19416,8 +19440,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19435,11 +19459,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Predor"
@@ -19459,6 +19483,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19476,11 +19500,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Usek"
@@ -19500,6 +19524,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19517,11 +19541,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Nasip"
@@ -19659,5 +19683,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19666,12 +19690,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19679,13 +19706,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19714,24 +19741,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Površina"
@@ -19743,5 +19766,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19755,11 +19778,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr ""
@@ -19767,10 +19789,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr ""
@@ -19778,10 +19800,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19789,11 +19811,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19801,10 +19822,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19812,10 +19833,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr ""
@@ -19823,10 +19844,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19834,11 +19855,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr ""
@@ -19846,10 +19866,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr ""
@@ -19857,10 +19877,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19868,10 +19888,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19879,10 +19899,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19890,10 +19910,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr ""
@@ -19901,10 +19921,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr ""
@@ -19912,10 +19932,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -19996,6 +20016,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Cesta (neznana kategorija)"
@@ -20004,5 +20023,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Uredi cesto neznane kategorije"
@@ -20010,6 +20029,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr ""
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr ""
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr ""
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "krožišče"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Cestne omejitve"
@@ -20018,15 +20066,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Uredi cestne omejitve"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Cestnina"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Brez izhoda (slepa ulica)"
@@ -20034,5 +20082,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Dostop"
@@ -20074,28 +20122,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "da"
@@ -20108,10 +20155,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20125,10 +20172,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20152,97 +20199,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr ""
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr ""
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr ""
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr ""
@@ -20257,10 +20304,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr ""
@@ -20276,10 +20323,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr ""
@@ -20294,19 +20341,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr ""
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Najnižja hitrost (km/h)"
@@ -20314,20 +20361,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20335,5 +20382,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Krožišče"
@@ -20344,5 +20391,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr ""
@@ -20362,10 +20409,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr ""
@@ -20387,10 +20434,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "hitra cesta"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr ""
@@ -20412,10 +20459,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "glavna"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr ""
@@ -20437,5 +20484,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20450,9 +20497,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "regionalna (turistična)"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr ""
@@ -20466,9 +20513,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr ""
@@ -20498,10 +20545,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr ""
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr ""
@@ -20531,5 +20578,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20541,10 +20588,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Uredi most"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20552,39 +20599,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Poti"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr ""
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr ""
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr ""
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "krožišče"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr ""
@@ -20593,73 +20611,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr ""
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Steza"
@@ -20668,38 +20654,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Uredi stezo"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
+#: build/trans_presets.java:490
+msgid "Wheelchairs"
+msgstr ""
+
+#: build/trans_presets.java:491
+msgid "Ski"
+msgstr ""
+
 #: build/trans_presets.java:492
-msgid "Wheelchairs"
-msgstr ""
-
-#: build/trans_presets.java:493
-msgid "Ski"
-msgstr ""
-
-#: build/trans_presets.java:494
 msgid "Snowmobile"
 msgstr ""
@@ -20708,5 +20724,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20714,5 +20730,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr ""
@@ -20720,5 +20736,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20736,11 +20752,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Uredi kolesarsko stezo"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20748,5 +20764,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20754,5 +20770,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20760,5 +20776,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20767,15 +20783,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Uredi pešpot"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Stopnice"
@@ -20785,10 +20797,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Uredi stopnice"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Avtocestno križišče"
@@ -20796,15 +20808,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Uredi avtocestno križišče"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr ""
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr ""
@@ -20812,5 +20824,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -20850,17 +20862,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr ""
@@ -20869,5 +20881,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Semafor"
@@ -20877,5 +20889,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20884,27 +20896,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20912,6 +20924,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20920,11 +20932,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20932,30 +20944,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stop znak"
@@ -20963,5 +20975,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -20970,14 +20982,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -20985,33 +20997,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21019,5 +21031,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21025,5 +21037,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21034,14 +21046,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Obračališče"
@@ -21051,5 +21063,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Znak za naselje"
@@ -21057,15 +21069,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Uredi znak za naselje"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr ""
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr ""
@@ -21074,5 +21086,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr ""
@@ -21080,5 +21092,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21086,5 +21098,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21092,5 +21104,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21100,10 +21112,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr ""
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr ""
@@ -21111,5 +21123,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Gorski prelaz"
@@ -21117,5 +21129,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Uredi gorski prelaz"
@@ -21127,7 +21139,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr ""
@@ -21135,5 +21147,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Ovire"
@@ -21141,5 +21153,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Stebriček"
@@ -21147,5 +21159,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr ""
@@ -21190,16 +21202,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr ""
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21208,5 +21220,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21214,5 +21226,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Rešetka za živino"
@@ -21220,10 +21232,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr ""
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr ""
@@ -21231,15 +21243,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Cestninska postaja"
@@ -21247,5 +21259,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Uredi cestninsko postajo"
@@ -21253,10 +21265,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr ""
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr ""
@@ -21266,5 +21278,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr ""
@@ -21275,22 +21287,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr ""
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr ""
@@ -21298,5 +21310,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr ""
@@ -21305,5 +21317,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr ""
@@ -21315,10 +21327,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr ""
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr ""
@@ -21326,5 +21338,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Vrata"
@@ -21332,50 +21344,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr ""
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21383,25 +21395,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr ""
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr ""
@@ -21412,11 +21424,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Voda"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Izvir"
@@ -21424,5 +21436,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Uredi izvir"
@@ -21430,5 +21442,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21436,10 +21448,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21447,10 +21459,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Potok"
@@ -21458,10 +21470,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Uredi potok"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -21469,10 +21481,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Uredi kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Reka"
@@ -21482,5 +21494,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Uredi reko"
@@ -21488,15 +21500,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Uredi vodo"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Kopno"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Uredi kopno"
@@ -21504,15 +21516,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr ""
@@ -21520,15 +21532,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr ""
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr ""
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr ""
@@ -21536,5 +21548,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr ""
@@ -21543,10 +21555,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr ""
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr ""
@@ -21557,14 +21569,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr ""
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr ""
@@ -21578,35 +21590,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
+#: build/trans_presets.java:1032
+msgid "reedbed"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "saltmarsh"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "tidalflat"
+msgstr ""
+
+#: build/trans_presets.java:1032
+msgid "mangrove"
+msgstr ""
+
+#: build/trans_presets.java:1034
+msgid "Mud"
+msgstr ""
+
+#. item "Water/Water/Mud"
+#: build/trans_presets.java:1035
+msgid "Edit Mud"
+msgstr ""
+
+#. item "Water/Water/Mud" text "Name"
 #: build/trans_presets.java:1039
-msgid "reedbed"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "saltmarsh"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "tidalflat"
-msgstr ""
-
-#: build/trans_presets.java:1039
-msgid "mangrove"
-msgstr ""
-
-#: build/trans_presets.java:1041
-msgid "Mud"
-msgstr ""
-
-#. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
-msgid "Edit Mud"
-msgstr ""
-
-#. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
 msgid "Beach"
 msgstr ""
@@ -21614,20 +21626,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr ""
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr ""
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr ""
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr ""
@@ -21635,10 +21647,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr ""
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr ""
@@ -21646,5 +21658,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr ""
@@ -21652,5 +21664,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Pot trajekta"
@@ -21658,5 +21670,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr ""
@@ -21665,5 +21677,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Ladjedelnica"
@@ -21671,10 +21683,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Uredi ladjedelnico"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Dók"
@@ -21682,5 +21694,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Uredi dók"
@@ -21688,5 +21700,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Jez"
@@ -21694,15 +21706,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Uredi jez"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vodna točka"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Vodna zapornica"
@@ -21711,5 +21723,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr ""
@@ -21717,20 +21729,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr ""
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Slap"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Uredi slap"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Obračališče"
@@ -21739,15 +21751,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr ""
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Pomol"
@@ -21755,10 +21767,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Uredi pomol"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr ""
@@ -21766,10 +21778,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr ""
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr ""
@@ -21779,20 +21791,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
+#: build/trans_presets.java:1139
+msgid "Edit Slipway"
+msgstr ""
+
+#. item "Waterway Point/Slipway" text "Name"
+#: build/trans_presets.java:1145
+msgid "Transport"
+msgstr ""
+
+#. group "Transport"
 #: build/trans_presets.java:1146
-msgid "Edit Slipway"
-msgstr ""
-
-#. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
-msgid "Transport"
-msgstr ""
-
-#. group "Transport"
-#: build/trans_presets.java:1153
 msgid "Railway"
 msgstr "Železnica"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Železniški tir"
@@ -21800,5 +21812,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Uredi železniški tir"
@@ -21828,86 +21840,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21919,8 +21856,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21934,29 +21871,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -21969,8 +21906,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22041,8 +21978,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22054,8 +21991,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr ""
@@ -22068,8 +22005,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22082,23 +22019,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Tir ozkotirne železnice"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Uredi tir ozkotirne železnice"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr ""
@@ -22106,50 +22043,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr ""
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Podzemna"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Uredi podzemno"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr ""
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr ""
@@ -22157,5 +22094,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr ""
@@ -22164,10 +22101,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Nerabljen tir"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Uredi nerabljen tir"
@@ -22176,9 +22113,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Vrsta (neobvezno)"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Zapuščeni tir"
@@ -22187,5 +22124,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr ""
@@ -22194,5 +22131,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr ""
@@ -22202,5 +22139,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22208,5 +22145,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Okretnica"
@@ -22215,5 +22152,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22222,10 +22159,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Žičnica"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Sedežnica"
@@ -22233,10 +22170,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Uredi sedežnico"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Vlečnica"
@@ -22244,10 +22181,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Uredi vlečnico"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Kabinska žičnica"
@@ -22255,10 +22192,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Uredi kabinsko žičnico"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22266,10 +22203,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22278,5 +22215,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22284,5 +22221,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22291,5 +22228,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22297,5 +22234,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Gorivo"
@@ -22305,62 +22242,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Uredi gorivo"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22418,32 +22355,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr ""
@@ -22502,165 +22439,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22677,5 +22614,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22685,5 +22622,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Uredi parkirišče"
@@ -22694,25 +22631,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr ""
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr ""
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr ""
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22721,48 +22658,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr ""
 
 #. <space />
+#: build/trans_presets.java:1362
+msgid "Capacity (overall)"
+msgstr ""
+
+#. item "Car/Parking" text "Capacity (overall)"
+#: build/trans_presets.java:1363
+msgid "Spaces for Disabled"
+msgstr ""
+
+#: build/trans_presets.java:1364
+msgid "Spaces for Women"
+msgstr ""
+
+#: build/trans_presets.java:1365
+msgid "Spaces for Parents"
+msgstr ""
+
+#: build/trans_presets.java:1366
+msgid "See the Wiki for other capacity:[types]=*."
+msgstr ""
+
+#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+#: build/trans_presets.java:1368
+msgid "Wash"
+msgstr ""
+
+#. item "Car/Wash"
 #: build/trans_presets.java:1369
-msgid "Capacity (overall)"
-msgstr ""
-
-#. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
-msgid "Spaces for Disabled"
-msgstr ""
-
-#: build/trans_presets.java:1371
-msgid "Spaces for Women"
-msgstr ""
-
-#: build/trans_presets.java:1372
-msgid "Spaces for Parents"
-msgstr ""
-
-#: build/trans_presets.java:1373
-msgid "See the Wiki for other capacity:[types]=*."
-msgstr ""
-
-#. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
+msgid "Edit Car Wash"
+msgstr ""
+
+#. item "Car/Wash" text "Operator"
+#: build/trans_presets.java:1374
+msgid "Repair"
+msgstr ""
+
+#. item "Car/Repair"
 #: build/trans_presets.java:1375
-msgid "Wash"
-msgstr ""
-
-#. item "Car/Wash"
-#: build/trans_presets.java:1376
-msgid "Edit Car Wash"
-msgstr ""
-
-#. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
-msgid "Repair"
-msgstr ""
-
-#. item "Car/Repair"
-#: build/trans_presets.java:1382
 msgid "Edit Car Repair"
 msgstr ""
@@ -22770,5 +22707,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Izposojevalnica"
@@ -22777,10 +22714,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Uredi izposojevalnico avtomobilov"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22788,5 +22725,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22794,10 +22731,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr ""
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr ""
@@ -22806,10 +22743,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Uredi izposojevalnico koles"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22819,5 +22756,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22825,5 +22762,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22831,5 +22768,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Železniško postajališče"
@@ -22837,5 +22774,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22843,5 +22780,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr ""
@@ -22850,5 +22787,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr ""
@@ -22856,5 +22793,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Železniški peron"
@@ -22863,5 +22800,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Uredi železniški peron"
@@ -22873,5 +22810,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -22879,10 +22816,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr ""
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Vhod v podzemno"
@@ -22891,10 +22828,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Uredi vhod v podzemno"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -22903,5 +22840,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Avtobusna postaja"
@@ -22910,5 +22847,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Uredi avtobusno postajo"
@@ -22916,5 +22853,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Avtobusno postajališče"
@@ -22924,5 +22861,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Uredu avtobusno postajališče"
@@ -22931,6 +22868,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -22938,19 +22875,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Klopca"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Avtobusni peron"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Uredi avtobusni peron"
@@ -22958,5 +22895,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taksi"
@@ -22964,5 +22901,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Uredi postajališče taksijev"
@@ -22970,10 +22907,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Letališče"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -22981,5 +22918,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -22987,10 +22924,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -22999,5 +22936,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23005,5 +22942,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23011,5 +22948,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23017,5 +22954,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23023,5 +22960,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23029,5 +22966,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23037,5 +22974,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23045,5 +22982,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23054,6 +22991,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23063,5 +23000,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23070,5 +23007,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23076,5 +23013,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23082,15 +23019,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Nastanitev"
@@ -23102,5 +23039,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr ""
@@ -23109,15 +23046,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr ""
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr ""
@@ -23125,20 +23062,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr ""
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23146,10 +23083,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23157,30 +23094,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr ""
@@ -23188,10 +23125,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Hrana in pijača"
@@ -23202,5 +23139,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr ""
@@ -23208,5 +23145,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr ""
@@ -23214,5 +23151,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr ""
@@ -23220,73 +23157,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr ""
@@ -23294,17 +23231,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr ""
@@ -23312,9 +23249,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr ""
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pivnica"
@@ -23322,18 +23259,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Uredi pivnico"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23341,9 +23278,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr ""
@@ -23351,24 +23288,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr ""
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turizem"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr ""
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Muzej"
@@ -23376,9 +23313,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Uredi muzej"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Živalski vrt"
@@ -23387,9 +23324,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Uredi živalski vrt"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Razgledišče"
@@ -23397,24 +23334,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Uredi razgledišče"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr ""
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr ""
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Umetnina"
@@ -23422,5 +23359,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Uredi umetnino"
@@ -23428,19 +23365,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Zemljevid"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23478,5 +23415,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23484,28 +23421,28 @@
 msgstr ""
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23515,5 +23452,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23521,5 +23458,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr ""
@@ -23527,6 +23464,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Kolesarjenje"
@@ -23534,5 +23471,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23540,6 +23477,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Smučanje"
@@ -23547,5 +23484,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23553,46 +23490,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23600,29 +23537,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23630,25 +23567,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
+#: build/trans_presets.java:1806
+msgid "Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site"
+#: build/trans_presets.java:1807
+msgid "Edit Picnic Site"
+msgstr ""
+
+#. item "Tourism/Picnic Site" check "Fireplace"
 #: build/trans_presets.java:1813
-msgid "Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
-msgid "Edit Picnic Site"
-msgstr ""
-
-#. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
 msgid "Historic Places"
 msgstr "Zgodovinski kraji"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Grad"
@@ -23657,19 +23594,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Uredi grad"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruševine"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Uredi ruševine"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Arheološko najdišče"
@@ -23678,9 +23615,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Uredi arheološko najdišče"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr ""
@@ -23688,10 +23625,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr ""
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23699,5 +23636,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23705,15 +23642,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr ""
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr ""
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr ""
@@ -23721,55 +23658,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr ""
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Prosti čas"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Vodni park"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Uredi vodni park"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Igrišče"
@@ -23777,35 +23714,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Uredi igrišče"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Ribarjenje"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Uredi ribarjenje"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr ""
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Uredi stadion"
@@ -23819,6 +23756,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "izberite šport:"
@@ -24210,6 +24147,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24243,225 +24180,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "lokostrelstvo"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "košarka"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "plezanje"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "kolesarjenje"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gimnastika"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokej"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "strelišče"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "smučanje"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "nogomet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "plavanje"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "namizni_tenis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Športno središče"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Uredi športno središče"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr ""
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf igrišče"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Uredi golf igrišče"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Mini golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Uredi mini golf"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Šport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr ""
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr ""
@@ -24500,21 +24437,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "vrsta"
@@ -24553,203 +24490,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
+#: build/trans_presets.java:1952
+msgid "10pin"
+msgstr ""
+
+#. item "Sport/10pin"
+#: build/trans_presets.java:1953
+msgid "Edit 10pin"
+msgstr ""
+
+#: build/trans_presets.java:1958
+msgid "Athletics"
+msgstr ""
+
+#. item "Sport/Athletics"
 #: build/trans_presets.java:1959
-msgid "10pin"
-msgstr ""
-
-#. item "Sport/10pin"
-#: build/trans_presets.java:1960
-msgid "Edit 10pin"
-msgstr ""
-
-#: build/trans_presets.java:1965
-msgid "Athletics"
-msgstr ""
-
-#. item "Sport/Athletics"
-#: build/trans_presets.java:1966
 msgid "Edit Athletics"
 msgstr ""
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Lokostrelstvo"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Uredi lokostrelstvo"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Plezanje"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Uredi plezanje"
 
+#: build/trans_presets.java:1976
+msgid "Canoeing"
+msgstr ""
+
+#. item "Sport/Canoeing"
+#: build/trans_presets.java:1977
+msgid "Edit Canoeing"
+msgstr ""
+
+#. item "Sport/Cycling"
 #: build/trans_presets.java:1983
-msgid "Canoeing"
-msgstr ""
-
-#. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
-msgid "Edit Canoeing"
-msgstr ""
-
-#. item "Sport/Cycling"
-#: build/trans_presets.java:1990
 msgid "Edit Cycling"
 msgstr "Uredi kolesarjenje"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Pasje dirke"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Uredi pasje dirke"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr ""
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr ""
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Konjske dirke"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Uredi konjske dirke"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gimnastika"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Uredi gimnastiko"
 
+#: build/trans_presets.java:2012
+msgid "Motor Sports"
+msgstr ""
+
+#. item "Sport/Motor Sports"
+#: build/trans_presets.java:2013
+msgid "Edit Motor Sports"
+msgstr ""
+
+#: build/trans_presets.java:2018
+msgid "Skating"
+msgstr ""
+
+#. item "Sport/Skating"
 #: build/trans_presets.java:2019
-msgid "Motor Sports"
-msgstr ""
-
-#. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
-msgid "Edit Motor Sports"
-msgstr ""
-
+msgid "Edit Skating"
+msgstr ""
+
+#: build/trans_presets.java:2024
+msgid "Skateboard"
+msgstr ""
+
+#. item "Sport/Skateboard"
 #: build/trans_presets.java:2025
-msgid "Skating"
-msgstr ""
-
-#. item "Sport/Skating"
-#: build/trans_presets.java:2026
-msgid "Edit Skating"
-msgstr ""
-
-#: build/trans_presets.java:2031
-msgid "Skateboard"
-msgstr ""
-
-#. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
 msgid "Edit Skateboard"
 msgstr ""
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Plavanje"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Uredi plavanje"
@@ -24757,52 +24694,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Uredi smučanje"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Strelišče"
@@ -24810,177 +24747,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Uredi strelišče"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Šport (z žogo)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Nogomet"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Uredi nogomet"
 
+#: build/trans_presets.java:2060
+msgid "Football"
+msgstr ""
+
+#. item "Sport (Ball)/Football"
+#: build/trans_presets.java:2061
+msgid "Edit Football"
+msgstr ""
+
+#: build/trans_presets.java:2066
+msgid "Australian Football"
+msgstr ""
+
+#. item "Sport (Ball)/Australian Football"
 #: build/trans_presets.java:2067
-msgid "Football"
-msgstr ""
-
-#. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
-msgid "Edit Football"
-msgstr ""
-
+msgid "Edit Australian Football"
+msgstr ""
+
+#: build/trans_presets.java:2072
+msgid "Baseball"
+msgstr ""
+
+#. item "Sport (Ball)/Baseball"
 #: build/trans_presets.java:2073
-msgid "Australian Football"
-msgstr ""
-
-#. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
-msgid "Edit Australian Football"
-msgstr ""
-
-#: build/trans_presets.java:2079
-msgid "Baseball"
-msgstr ""
-
-#. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
 msgid "Edit Baseball"
 msgstr ""
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Košarka"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Uredi košarko"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Uredi golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_igrišče"
 
+#: build/trans_presets.java:2090
+msgid "Boule"
+msgstr ""
+
+#. item "Sport (Ball)/Boule"
+#: build/trans_presets.java:2091
+msgid "Edit Boule"
+msgstr ""
+
+#: build/trans_presets.java:2096
+msgid "Bowls"
+msgstr ""
+
+#. item "Sport (Ball)/Bowls"
 #: build/trans_presets.java:2097
-msgid "Boule"
-msgstr ""
-
-#. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
-msgid "Edit Boule"
-msgstr ""
-
+msgid "Edit Bowls"
+msgstr ""
+
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
 #: build/trans_presets.java:2103
-msgid "Bowls"
-msgstr ""
-
-#. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
-msgid "Edit Bowls"
-msgstr ""
-
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
+msgid "Edit Cricket Nets"
+msgstr ""
+
+#: build/trans_presets.java:2114
+msgid "Croquet"
+msgstr ""
+
+#. item "Sport (Ball)/Croquet"
 #: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
-msgid "Edit Cricket Nets"
-msgstr ""
-
-#: build/trans_presets.java:2121
-msgid "Croquet"
-msgstr ""
-
-#. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
 msgid "Edit Croquet"
 msgstr ""
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hokej"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Uredi hokej"
 
+#: build/trans_presets.java:2126
+msgid "Pelota"
+msgstr ""
+
+#. item "Sport (Ball)/Pelota"
+#: build/trans_presets.java:2127
+msgid "Edit Pelota"
+msgstr ""
+
+#: build/trans_presets.java:2132
+msgid "Racquet"
+msgstr ""
+
+#. item "Sport (Ball)/Racquet"
 #: build/trans_presets.java:2133
-msgid "Pelota"
-msgstr ""
-
-#. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
-msgid "Edit Pelota"
-msgstr ""
-
+msgid "Edit Racquet"
+msgstr ""
+
+#: build/trans_presets.java:2138
+msgid "Rugby"
+msgstr ""
+
+#. item "Sport (Ball)/Rugby"
 #: build/trans_presets.java:2139
-msgid "Racquet"
-msgstr ""
-
-#. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
-msgid "Edit Racquet"
-msgstr ""
-
-#: build/trans_presets.java:2145
-msgid "Rugby"
-msgstr ""
-
-#. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
 msgid "Edit Rugby"
 msgstr ""
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Namizni tenis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Uredi namizni tenis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tenis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Uredi tenis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Zgradba"
@@ -24988,5 +24925,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Javne zgradbe"
@@ -24994,10 +24931,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Uredi javno zgradbo"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Mestna hiša"
@@ -25005,10 +24942,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Uredi mestno hišo"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Veleposlaništvo"
@@ -25016,10 +24953,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Uredi veleposlaništvo"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Sodišče"
@@ -25028,10 +24965,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Uredi sodišče"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Zapor"
@@ -25040,10 +24977,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Uredi zapor"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Policijska postaja"
@@ -25053,10 +24990,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Uredi policijsko postajo"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Gasilski dom"
@@ -25065,10 +25002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Uredi gasilski dom"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Pošta"
@@ -25076,5 +25013,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Uredi pošto"
@@ -25082,15 +25019,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr ""
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Šola"
@@ -25098,10 +25035,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Uredi šolo"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr ""
@@ -25109,10 +25046,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr ""
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr ""
@@ -25120,5 +25057,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr ""
@@ -25126,5 +25063,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Kinematograf"
@@ -25133,10 +25070,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Uredi kinematograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Knjižnica"
@@ -25145,9 +25082,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Uredi knjižnico"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr ""
@@ -25155,10 +25092,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr ""
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Gledališče"
@@ -25167,10 +25104,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Uredi gledališče"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Kraj čaščenja"
@@ -25180,5 +25117,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Uredi kraj čaščenja"
@@ -25187,6 +25124,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Vera"
@@ -25195,66 +25132,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr ""
@@ -25263,81 +25200,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Naslovi"
@@ -25346,5 +25283,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Urejanje podatkov o naslovu"
@@ -25352,5 +25289,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -25358,25 +25295,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Ime ceste"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Poštna številka"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr ""
@@ -25385,5 +25322,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Uredi interpolacijo naslovov"
@@ -25391,61 +25328,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr ""
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr ""
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr ""
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr ""
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr ""
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Stolp"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Uredi stolp"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25453,25 +25390,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vodni stolp"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Uredi vodni stolp"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr ""
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Svetilnik"
@@ -25479,10 +25416,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Uredi svetilnik"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Mlin na veter"
@@ -25490,10 +25427,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Uredi mlin na veter"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Cevovod"
@@ -25502,41 +25439,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Uredi cevovod"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Čistilna naprava"
@@ -25546,10 +25483,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Uredi čistilno napravo"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Žerjav"
@@ -25557,5 +25494,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Uredi žerjav"
@@ -25563,10 +25500,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Geodetska točka"
@@ -25574,10 +25511,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Uredi geodetsko točko"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Video nadzor"
@@ -25585,23 +25522,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Uredi video nadzorno kamero"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr ""
@@ -25611,35 +25548,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr ""
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr ""
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr ""
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr ""
@@ -25648,10 +25585,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr ""
@@ -25660,5 +25597,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -25666,10 +25603,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Steber daljnovoda"
@@ -25680,23 +25617,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Uredi steber daljnovoda"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr ""
@@ -25705,74 +25642,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
+#: build/trans_presets.java:2423
+msgid "Edit Power Line"
+msgstr ""
+
+#. item "Man Made/Power Line" label "Edit Power Line"
+#: build/trans_presets.java:2424
+msgid "Line type"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Line type"
+#: build/trans_presets.java:2424
+msgid "line"
+msgstr ""
+
+#: build/trans_presets.java:2424
+msgid "minor_line"
+msgstr ""
+
+#. item "Man Made/Power Line" combo "Voltage"
+#: build/trans_presets.java:2429
+msgid "Amount of Cables"
+msgstr ""
+
+#. item "Man Made/Power Line" text "Amount of Cables"
 #: build/trans_presets.java:2430
-msgid "Edit Power Line"
-msgstr ""
-
-#. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
-msgid "Line type"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
-msgid "line"
-msgstr ""
-
-#: build/trans_presets.java:2431
-msgid "minor_line"
-msgstr ""
-
-#. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
-msgid "Amount of Cables"
-msgstr ""
-
-#. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr ""
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Stranišča"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Poštni nabiralnik"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -25781,5 +25718,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Uredi telefon"
@@ -25787,5 +25724,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Kovanci"
@@ -25793,5 +25730,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Bankovci"
@@ -25799,5 +25736,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr ""
@@ -25805,5 +25742,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Debetne kartice"
@@ -25811,15 +25748,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditne kartice"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonske kartice"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Recikliranje"
@@ -25828,5 +25765,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Uredi raciklažno točko"
@@ -25834,35 +25771,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
+#: build/trans_presets.java:2467
+msgid "Batteries"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Batteries"
+#: build/trans_presets.java:2468
+msgid "Cans"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Cans"
+#: build/trans_presets.java:2469
+msgid "Clothes"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Clothes"
+#: build/trans_presets.java:2470
+msgid "Glass"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Glass"
+#: build/trans_presets.java:2471
+msgid "Paper"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Paper"
+#: build/trans_presets.java:2472
+msgid "Scrap Metal"
+msgstr ""
+
+#. item "Amenities/Recycling" check "Scrap Metal"
 #: build/trans_presets.java:2474
-msgid "Batteries"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
-msgid "Cans"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
-msgid "Clothes"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
-msgid "Glass"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
-msgid "Paper"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
-msgid "Scrap Metal"
-msgstr ""
-
-#. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
 msgid "Waste Basket"
 msgstr ""
@@ -25870,5 +25807,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25877,31 +25814,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -25980,5 +25917,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -25988,31 +25925,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26021,30 +25958,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr ""
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr ""
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr ""
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr ""
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr ""
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr ""
@@ -26053,10 +25990,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr ""
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Pitna voda"
@@ -26065,10 +26002,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Uredi pitno vodo"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26077,5 +26014,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26083,5 +26020,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26089,15 +26026,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Trgovine"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26105,10 +26042,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr ""
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26117,28 +26054,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr ""
 
 #. item "Shops/Bike Dealer" text "Name"
+#: build/trans_presets.java:2538
+msgid "Supermarket"
+msgstr ""
+
+#. item "Shops/Supermarket"
+#: build/trans_presets.java:2539
+msgid "Edit Supermarket"
+msgstr ""
+
+#: build/trans_presets.java:2544
+msgid "Chemist"
+msgstr ""
+
+#. item "Shops/Chemist"
 #: build/trans_presets.java:2545
-msgid "Supermarket"
-msgstr ""
-
-#. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
-msgid "Edit Supermarket"
-msgstr ""
-
-#: build/trans_presets.java:2551
-msgid "Chemist"
-msgstr ""
-
-#. item "Shops/Chemist"
-#: build/trans_presets.java:2552
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr ""
@@ -26146,9 +26083,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr ""
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr ""
@@ -26156,27 +26093,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr ""
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Mesar"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "Uredi mesarja"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Pekarna"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Uredi pekarno"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Sam svoj mojster"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Uredi sam svoj mojster trgovino"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr ""
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr ""
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Čistilnica"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Uredi čistilnico"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Pralnica"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Uredi pralnico"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr ""
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr ""
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Prodajni avtomat"
@@ -26184,5 +26335,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Uredi prodajni avtomat"
@@ -26190,306 +26341,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Prodajani izdelki"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "pijača"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM kartice"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "Kolo"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Mesar"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Uredi mesarja"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Pekarna"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Uredi pekarno"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Sam svoj mojster"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Uredi sam svoj mojster trgovino"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr ""
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr ""
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Čistilnica"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Uredi čistilnico"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Pralnica"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Uredi pralnico"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr ""
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr ""
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr ""
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Denar"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banka"
@@ -26497,14 +26440,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Uredi banko"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Bankomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Menjalnica"
@@ -26512,5 +26455,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Uredi menjalnico"
@@ -26518,15 +26461,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Uredi bankomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Zdravje"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr ""
@@ -26534,18 +26477,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr ""
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr ""
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr ""
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Lekarna"
@@ -26553,5 +26496,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Uredi lekarno"
@@ -26559,9 +26502,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr ""
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Bolnišnica"
@@ -26569,10 +26512,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Uredi bolnišnico"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26581,5 +26524,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26588,20 +26531,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr ""
@@ -26609,5 +26552,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr ""
@@ -26616,64 +26559,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
+#: build/trans_presets.java:2809
+msgid "Edit Veterinary"
+msgstr ""
+
 #: build/trans_presets.java:2816
-msgid "Edit Veterinary"
-msgstr ""
-
-#: build/trans_presets.java:2823
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Kraji"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Uredi kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Država"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Uredi državo"
 
 #. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2830
+msgid "State"
+msgstr ""
+
+#. item "Geography/Places/State"
+#: build/trans_presets.java:2831
+msgid "Edit State"
+msgstr ""
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2836
+msgid "Region"
+msgstr ""
+
+#. item "Geography/Places/Region"
 #: build/trans_presets.java:2837
-msgid "State"
-msgstr ""
-
-#. item "Geography/Places/State"
-#: build/trans_presets.java:2838
-msgid "Edit State"
-msgstr ""
-
-#. item "Geography/Places/State" text "Name"
+msgid "Edit Region"
+msgstr ""
+
+#. item "Geography/Places/Region" text "Name"
+#: build/trans_presets.java:2842
+msgid "County"
+msgstr ""
+
+#. item "Geography/Places/County"
 #: build/trans_presets.java:2843
-msgid "Region"
-msgstr ""
-
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
-msgid "Edit Region"
-msgstr ""
-
-#. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
-msgid "County"
-msgstr ""
-
-#. item "Geography/Places/County"
-#: build/trans_presets.java:2850
 msgid "Edit County"
 msgstr ""
@@ -26681,15 +26624,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr ""
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr ""
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr ""
@@ -26697,10 +26640,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr ""
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr ""
@@ -26708,25 +26651,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr ""
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Vas"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Uredi vas"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Zaselek"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Uredi zaselek"
@@ -26734,5 +26677,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26740,10 +26683,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Otok"
@@ -26751,10 +26694,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Uredi otok"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26762,5 +26705,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26768,5 +26711,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr ""
@@ -26774,10 +26717,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr ""
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Vrh"
@@ -26785,10 +26728,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Uredi vrh"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr ""
@@ -26796,10 +26739,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr ""
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr ""
@@ -26807,70 +26750,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr ""
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Meje"
 
 #. group "Boundaries"
+#: build/trans_presets.java:2933
+msgid "National"
+msgstr ""
+
+#. item "Boundaries/National"
+#: build/trans_presets.java:2934
+msgid "Edit National Boundary"
+msgstr ""
+
+#. item "Boundaries/National" text "Name"
+#: build/trans_presets.java:2939
+msgid "Administrative"
+msgstr ""
+
+#. item "Boundaries/Administrative"
 #: build/trans_presets.java:2940
-msgid "National"
-msgstr ""
-
-#. item "Boundaries/National"
-#: build/trans_presets.java:2941
-msgid "Edit National Boundary"
-msgstr ""
-
-#. item "Boundaries/National" text "Name"
+msgid "Edit Administrative Boundary"
+msgstr ""
+
+#. item "Boundaries/Administrative" text "Name"
+#: build/trans_presets.java:2945
+msgid "Civil"
+msgstr ""
+
+#. item "Boundaries/Civil"
 #: build/trans_presets.java:2946
-msgid "Administrative"
-msgstr ""
-
-#. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
-msgid "Edit Administrative Boundary"
-msgstr ""
-
-#. item "Boundaries/Administrative" text "Name"
+msgid "Edit Civil Boundary"
+msgstr ""
+
+#. item "Boundaries/Civil" text "Name"
+#: build/trans_presets.java:2951
+msgid "Political"
+msgstr ""
+
+#. item "Boundaries/Political"
 #: build/trans_presets.java:2952
-msgid "Civil"
-msgstr ""
-
-#. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
-msgid "Edit Civil Boundary"
-msgstr ""
-
-#. item "Boundaries/Civil" text "Name"
+msgid "Edit Political Boundary"
+msgstr ""
+
+#. item "Boundaries/Political" text "Name"
+#: build/trans_presets.java:2957
+msgid "National park"
+msgstr ""
+
+#. item "Boundaries/National park"
 #: build/trans_presets.java:2958
-msgid "Political"
-msgstr ""
-
-#. item "Boundaries/Political"
-#: build/trans_presets.java:2959
-msgid "Edit Political Boundary"
-msgstr ""
-
-#. item "Boundaries/Political" text "Name"
+msgid "Edit National Park Boundary"
+msgstr ""
+
+#. item "Boundaries/National park" text "Name"
 #: build/trans_presets.java:2964
-msgid "National park"
-msgstr ""
-
-#. item "Boundaries/National park"
-#: build/trans_presets.java:2965
-msgid "Edit National Park Boundary"
-msgstr ""
-
-#. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
 msgid "Land use"
 msgstr "Raba tal"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Drevo"
@@ -26879,15 +26822,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Uredi drevo"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr ""
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr ""
@@ -26896,5 +26839,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr ""
@@ -26902,17 +26845,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr ""
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr ""
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Gozd"
@@ -26921,14 +26864,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Uredi gozdnata tla"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Naravni rezervat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Uredi naravni rezervat"
@@ -26936,25 +26879,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -26962,10 +26905,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -26973,5 +26916,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -26979,5 +26922,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -26986,45 +26929,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr ""
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr ""
+
+#. item "Land use/Meadow"
 #: build/trans_presets.java:3036
-msgid "Farmland"
-msgstr ""
-
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3037
-msgid "Edit Farmland Landuse"
-msgstr ""
-
-#. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
-msgid "Meadow"
-msgstr ""
-
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3043
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vinograd"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Uredi vinograd"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr ""
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27032,25 +26975,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr ""
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr ""
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr ""
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27058,10 +27001,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27069,20 +27012,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr ""
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr ""
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27090,5 +27033,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27096,15 +27039,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Pokopališče"
@@ -27112,9 +27055,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Uredi pokopališče"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr ""
@@ -27122,39 +27065,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
 #: build/trans_presets.java:3114
-msgid "Edit Cemetery Landuse"
-msgstr ""
-
+msgid "Retail"
+msgstr ""
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
 #: build/trans_presets.java:3121
-msgid "Retail"
-msgstr ""
-
-#. item "Land use/Retail"
-#: build/trans_presets.java:3122
-msgid "Edit Retail Landuse"
-msgstr ""
-
-#. item "Land use/Retail" text "Name"
+msgid "Edit Commercial Landuse"
+msgstr ""
+
+#. item "Land use/Commercial" text "Name"
+#: build/trans_presets.java:3126
+msgid "Industrial"
+msgstr ""
+
+#. item "Land use/Industrial"
 #: build/trans_presets.java:3127
-msgid "Commercial"
-msgstr ""
-
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3128
-msgid "Edit Commercial Landuse"
-msgstr ""
-
-#. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
-msgid "Industrial"
-msgstr ""
-
-#. item "Land use/Industrial"
-#: build/trans_presets.java:3134
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Ozemlje železnice"
@@ -27162,15 +27105,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Uredi ozemlje železnice"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27178,50 +27121,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Gradbišče"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr ""
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
 msgid "Edit Landfill Landuse"
 msgstr ""
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Kamnolom"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Uredi kamnolom"
@@ -27231,5 +27174,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27238,10 +27181,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27249,5 +27192,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27256,5 +27199,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27262,34 +27205,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27298,15 +27241,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27314,5 +27257,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27321,5 +27264,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27327,5 +27270,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27416,5 +27359,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27424,17 +27367,17 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27494,5 +27437,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27501,9 +27444,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27517,10 +27460,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27528,31 +27471,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27561,31 +27504,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/sv.po
===================================================================
--- /applications/editors/josm/i18n/po/sv.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/sv.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-07 11:14+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 18:49+0000\n"
 "Last-Translator: Erik Iohansson <erjohan@gmail.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:47+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:49+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -66,5 +66,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1203,5 +1203,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Kan inte flytta objekt utanför världen."
@@ -1524,5 +1524,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2296,9 +2296,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2381,26 +2381,26 @@
 msgstr "Avsluta ritning."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Dra ut"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Skapa ytor"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Dra ut sträcka"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "Flytta ett segment längs dess normal och släpp sedan musknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "Rita en rektangel av önskad storlek, och släpp sedan musknappen."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2422,6 +2422,6 @@
 "därifrån; SKIFT-släpp för att synkronisera ljud vid den punkten."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2433,9 +2433,9 @@
 msgstr "Markera"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Välj, flytta och rotera objekt."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2444,17 +2444,17 @@
 msgstr[1] "Lägg till och flytta en virtuell ny nod till {0} vägar."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "Flytta element"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Flytta"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Ångra flytt"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2467,9 +2467,9 @@
 "Säker på att du vill flytta dem?"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Släpp musknappen för att välja objekten i rektangeln."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2478,9 +2478,9 @@
 "nod."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Släpp musknappen för att sluta rotera."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3236,5 +3236,5 @@
 msgstr "Tillämpa?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3810,12 +3810,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Inte ansluten"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "Bilder som inte taggats ännu"
+msgstr ""
 
 #. teal
@@ -3996,5 +3994,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "järnväg"
@@ -5275,5 +5273,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "alla"
@@ -5689,4 +5687,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5777,5 +5780,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "Relationer"
@@ -5877,9 +5880,9 @@
 msgstr "Urval: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Lossa panelen"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
@@ -5888,5 +5891,5 @@
 "vänstra verktygraden."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "Klicka för att minimera/maximera panelens innehåll"
@@ -6216,4 +6219,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6226,10 +6235,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6899,145 +6902,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "Namn"
@@ -8253,10 +8256,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Typ"
@@ -8264,5 +8267,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8276,17 +8278,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "okänd"
@@ -9056,11 +9057,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9077,14 +9080,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Lager"
@@ -9617,5 +9620,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "Beskrivning"
@@ -10690,55 +10693,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11225,5 +11228,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Bil"
@@ -11245,16 +11248,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Cykel"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11284,12 +11288,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Fotgängare"
@@ -12004,12 +12008,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Gatunamn"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "Uppmätta värden."
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14272,6 +14274,7 @@
 msgstr "Skicka in spår"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14362,5 +14365,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adressinterpolation"
@@ -14547,5 +14550,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14586,19 +14589,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Byggnader"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14606,5 +14609,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14617,10 +14620,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14662,7 +14665,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "Lambertzon 1 cachefil (.4)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14804,5 +14806,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16650,5 +16652,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Kollektivtrafik"
@@ -16700,5 +16702,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Vägpunkter"
@@ -17277,4 +17279,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Typ"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17431,4 +17450,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Ta bort den valda relationen"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18188,5 +18220,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr "Multipolygon"
@@ -19482,7 +19514,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referens"
@@ -19499,5 +19531,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Filer"
@@ -19515,4 +19547,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19520,9 +19553,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Största tillåtna hastighet (km/h)"
@@ -19550,15 +19582,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19569,11 +19595,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "Enkelriktat"
@@ -19593,15 +19618,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19618,11 +19641,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19643,8 +19666,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19662,11 +19685,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunnel"
@@ -19686,6 +19709,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19703,11 +19726,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Skärning"
@@ -19727,6 +19750,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19744,11 +19767,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "Bank"
@@ -19886,5 +19909,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19893,12 +19916,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19906,13 +19932,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "Bredd (meter)"
@@ -19941,24 +19967,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Yta"
@@ -19970,5 +19992,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19982,11 +20004,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "belagd"
@@ -19994,10 +20015,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "obelagd"
@@ -20005,10 +20026,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -20016,11 +20037,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -20028,10 +20048,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -20039,10 +20059,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "skog"
@@ -20050,10 +20070,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -20061,11 +20081,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "kullersten"
@@ -20073,10 +20092,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "grus"
@@ -20084,10 +20103,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -20095,10 +20114,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -20106,10 +20125,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20117,10 +20136,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "gräs"
@@ -20128,10 +20147,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "sand"
@@ -20139,10 +20158,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr ""
@@ -20223,6 +20242,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "Väg (okänd typ)"
@@ -20231,5 +20249,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Redigera en väg av okänd typ"
@@ -20237,6 +20255,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "Under byggnad"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Redigera en väg under byggnad"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Korsning"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "rondell"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Vägbegränsningar"
@@ -20245,15 +20292,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Redigera vägbegränsningar"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "Betalstation"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Återvändsgränd"
@@ -20261,5 +20308,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20301,28 +20348,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "ja"
@@ -20335,10 +20381,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20352,10 +20398,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20379,97 +20425,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "med tillåtelse"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "jordbruksfordon"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "nej"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "avsedd för"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "Lätt lastbil"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Tung lastbil"
@@ -20484,10 +20530,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "Häst"
@@ -20503,10 +20549,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motorcykel"
@@ -20521,19 +20567,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "Bil"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Allmänna transportmedel (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Minsta tillåtna hastighet (km/h)"
@@ -20541,20 +20587,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Största tillåtna vikt (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "Största tillåtna höjd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "Största tillåtna bredd (meter)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "Största tillåtna längd (meter)"
@@ -20562,5 +20608,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Rondell"
@@ -20571,5 +20617,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Redigera en korsning"
@@ -20589,10 +20635,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "motorväg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "motorvägslänk"
@@ -20614,10 +20660,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "stamväg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "stamvägslänk"
@@ -20639,10 +20685,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "primärväg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "primärvägslänk"
@@ -20664,5 +20710,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20677,9 +20723,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "tertiärväg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "oklassificerad"
@@ -20693,9 +20739,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "bostadsgata"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "gårdsgata"
@@ -20725,10 +20771,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "tillfartsväg"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "buss_spårväg"
@@ -20758,5 +20804,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20768,10 +20814,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Redigera en bro"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "Redigera en tunnel"
@@ -20779,39 +20825,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Stigar och småvägar"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "Under byggnad"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Redigera en väg under byggnad"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Korsning"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "rondell"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "Bruksväg"
@@ -20820,73 +20837,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "Redigera en bruksväg"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Stig"
@@ -20895,38 +20880,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Redigera en stig"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Skidor"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "Snöskoter"
@@ -20935,5 +20950,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20941,5 +20956,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "Redigera en gång-/ridstig"
@@ -20947,5 +20962,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20963,11 +20978,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Redigera en cykelbana"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20975,5 +20990,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20981,5 +20996,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20987,5 +21002,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20994,15 +21009,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Redigera en gångstig"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "Trappsteg"
@@ -21012,10 +21023,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Redigera en trappa"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Motorvägskorsning"
@@ -21023,15 +21034,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Redigera en motorvägskorsning"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Nummer"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Tjänster"
@@ -21039,5 +21050,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr ""
@@ -21077,17 +21088,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operatör"
@@ -21096,5 +21107,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Trafikljus"
@@ -21104,5 +21115,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "Typ av övergångsställe"
@@ -21111,27 +21122,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "obevakad"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "trafikljus"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "ö"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "utan markering"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr "Korsa ridande"
@@ -21139,6 +21150,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "Korsa cyklande"
@@ -21147,11 +21158,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "Brittiskt namn på övergångsställe"
@@ -21159,30 +21170,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "övergångsställe"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelican"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr "toucan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr "puffin"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr "pegasus"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr "tiger"
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Stopp"
@@ -21190,5 +21201,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "Övergångsställe för fotgängare"
@@ -21197,14 +21208,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "Brittiskt typnamn"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21212,33 +21223,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21246,5 +21257,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21252,5 +21263,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "Minirondell"
@@ -21261,14 +21272,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "Riktning"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "medurs"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Vändplats"
@@ -21278,5 +21289,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "Stadsgräns"
@@ -21284,15 +21295,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "Redigera en stadsgränsskylt"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "Andra namn"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "Hastighetskamera"
@@ -21301,5 +21312,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Nödtelefon"
@@ -21307,5 +21318,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "Lutning"
@@ -21313,5 +21324,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "Brant lutning"
@@ -21319,5 +21330,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21327,10 +21338,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "Vadställe"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "Redigera ett vadställe"
@@ -21338,5 +21349,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Bergspass"
@@ -21344,5 +21355,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "Redigera ett bergspass"
@@ -21354,7 +21365,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "Höjd"
@@ -21362,5 +21373,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Hinder"
@@ -21368,5 +21379,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "Trafikkon"
@@ -21374,5 +21385,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "Redigera en trafikkon"
@@ -21417,16 +21428,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "Tillåten trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21435,5 +21446,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr ""
@@ -21441,5 +21452,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Färist"
@@ -21447,10 +21458,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Redigera en färist"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "Bussfålla"
@@ -21458,15 +21469,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spikhinder"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "Redigera spikhinder"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "Betalstation"
@@ -21474,5 +21485,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "Redigera betalstation"
@@ -21480,10 +21491,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Gränskontroll"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Redigera en gränskontroll"
@@ -21493,5 +21504,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Häck"
@@ -21502,22 +21513,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Stängsel"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Mur"
@@ -21525,5 +21536,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Stadsmur"
@@ -21532,5 +21543,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "Stödmur"
@@ -21542,10 +21553,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Ingång"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Redigera en ingång"
@@ -21553,5 +21564,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Grind"
@@ -21559,50 +21570,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Redigera en grind"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Bom"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "Redigera en bom"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Redigera en taggtrådsgrind"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Fösgrind"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Redigera en fösgrind"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "Manshål"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "Redigera ett manshål"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Stätta"
@@ -21610,25 +21621,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Redigera en stätta"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr "Vändkors"
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr "Redigera vändkors"
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Utfallsport"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Redigera en utfallsport"
@@ -21639,11 +21650,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Vatten"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Källa"
@@ -21651,5 +21662,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Redigera en källa"
@@ -21657,5 +21668,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "Avlopp"
@@ -21663,10 +21674,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "Redigera en avloppsränna"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21674,10 +21685,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "Bäck"
@@ -21685,10 +21696,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "Redigera en bäck"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -21696,10 +21707,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Redigera en kanal"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "Flod"
@@ -21709,5 +21720,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "Redigera en flod"
@@ -21715,15 +21726,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Redigera vatten"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Land"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Redigera land"
@@ -21731,15 +21742,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "Hamnbassäng"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "Redigera användning av mark för hamnbassäng"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Resevoar"
@@ -21747,15 +21758,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Redigera användning av mark för resevoar"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Täckt resevoar"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Redigera täckt resevoar"
@@ -21763,5 +21774,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Flodbank"
@@ -21770,10 +21781,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Redigera en flodbank"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "Våtmark"
@@ -21784,14 +21795,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "Redigera våtmark"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "träsk"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "mosse"
@@ -21805,35 +21816,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "kärr"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "vassbädd"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "saltäng"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "marskland"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "mangroveträsk"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Lera"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Redigera lera"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Strand"
@@ -21841,20 +21852,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Redigera strand"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Bukt"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "Redigera bukt"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Stup"
@@ -21862,10 +21873,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Redigera stup"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Kustlinje"
@@ -21873,5 +21884,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Redigera kustlinje"
@@ -21879,5 +21890,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "Färjelinje"
@@ -21885,5 +21896,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "Redigera en färjelinje"
@@ -21892,5 +21903,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Varv"
@@ -21898,10 +21909,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Redigera ett varv"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "Docka"
@@ -21909,5 +21920,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "Redigera en docka"
@@ -21915,5 +21926,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Damm"
@@ -21921,15 +21932,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Redigera en damm"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Vattenpunkter"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Slussport"
@@ -21938,5 +21949,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "Överfallsdamm"
@@ -21944,20 +21955,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "Redigera en överfallsdamm"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "Vattenfall"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "Redigera ett vattenfall"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "Vändplats"
@@ -21966,15 +21977,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Småbåtshamn"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Redigera en småbåtshamn"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Pir"
@@ -21982,10 +21993,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Redigera pir"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Färjeterminal"
@@ -21993,10 +22004,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Redigera en färjeterminal"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Slip"
@@ -22006,20 +22017,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Redigera en slip"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Järnväg"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Järnväg"
@@ -22027,5 +22038,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Redigera en järnväg"
@@ -22055,86 +22066,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22146,8 +22082,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22161,29 +22097,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "bangård"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "sidospår"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "stickspår"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22196,8 +22132,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22268,8 +22204,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22281,8 +22217,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Spänning"
@@ -22295,8 +22231,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22309,23 +22245,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Smalspår"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Redigera en smalspårig järnväg"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "Monorail"
@@ -22333,50 +22269,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "Redigera en monorailbana"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Museijärnväg"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Redigera en museijärnväg"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr ""
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Tunnelbana"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Redigera en tunnebana"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Spårvagn"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Redigera en spårväg"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Spårbussväg"
@@ -22384,5 +22320,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Redigera en spårbussväg"
@@ -22391,10 +22327,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Järnväg utan trafik"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Redigera en järnväg utan trafik"
@@ -22403,9 +22339,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "Valfria typer"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Nedlagd järnväg"
@@ -22414,5 +22350,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "Plankorsning"
@@ -22421,5 +22357,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "Järnvägsövergång"
@@ -22429,5 +22365,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "Typ av övergångsställe"
@@ -22435,5 +22371,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "Vändskiva"
@@ -22442,5 +22378,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22449,10 +22385,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "Linbana"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Stollift"
@@ -22460,10 +22396,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Redigera en stollift"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Släplift"
@@ -22471,10 +22407,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Redigera en släplift"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Linbana"
@@ -22482,10 +22418,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Redigera linbana"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22493,10 +22429,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22505,5 +22441,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22511,5 +22447,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22518,5 +22454,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22524,5 +22460,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Bränsle"
@@ -22532,62 +22468,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Redigera bränsle"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22645,32 +22581,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Öppettider"
@@ -22729,165 +22665,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22904,5 +22840,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22912,5 +22848,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Redigera en parkeringsplats"
@@ -22921,25 +22857,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referensnummer"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "flervånings-"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "ytbeläggning"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "underjordisk"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22948,48 +22884,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Avgift"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Handikappplatser"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Biltvätt"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Redigera en biltvätt"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "Bilverkstad"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "Redigera en bilverkstad"
@@ -22997,5 +22933,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "Uthyrning"
@@ -23004,10 +22940,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "Redigera biluthyrning"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Bilpool"
@@ -23015,5 +22951,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Redigera bilpool"
@@ -23021,10 +22957,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Redigera en cykelparkering"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "Kapacitet"
@@ -23033,10 +22969,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "Redigera en cykeluthyrning"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -23046,5 +22982,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -23052,5 +22988,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-klassificering"
@@ -23058,5 +22994,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Järnvägshållplats"
@@ -23064,5 +23000,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Redigera hållplats"
@@ -23070,5 +23006,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Spårvagnshållplats"
@@ -23077,5 +23013,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "Redigera spårvagnshållplats"
@@ -23083,5 +23019,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Plattform"
@@ -23090,5 +23026,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Redigera plattform"
@@ -23100,5 +23036,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "Referens (spårnummer)"
@@ -23106,10 +23042,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Område"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Tunnelbaneingång"
@@ -23118,10 +23054,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Redigera tunnelbaneingång"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "Rullstol"
@@ -23130,5 +23066,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "Bussterminal"
@@ -23137,5 +23073,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "Redigera en bussterminal"
@@ -23143,5 +23079,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "Busshållplats"
@@ -23151,5 +23087,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "Redigera en busshållplats"
@@ -23158,6 +23094,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Vindskydd"
@@ -23165,19 +23101,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "Bänk"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "Bussplattform"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "Redigera en bussplattform"
@@ -23185,5 +23121,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taxi"
@@ -23191,5 +23127,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "Redigera en taxistation"
@@ -23197,10 +23133,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Flygplats"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23208,5 +23144,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23214,10 +23150,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23226,5 +23162,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23232,5 +23168,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23238,5 +23174,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23244,5 +23180,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23250,5 +23186,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23256,5 +23192,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23264,5 +23200,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23272,5 +23208,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23281,6 +23217,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fyrbåk"
@@ -23290,5 +23226,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23297,5 +23233,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23303,5 +23239,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23309,15 +23245,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "Turism"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "Logi"
@@ -23329,5 +23265,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotell"
@@ -23336,15 +23272,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Redigera ett hotell"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stjärnor"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motell"
@@ -23352,20 +23288,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Redigera ett motell"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Pensionat"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Redigera pensionat"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "Fäbod"
@@ -23373,10 +23309,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "Redigera fäbod"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Vandrarhem"
@@ -23384,30 +23320,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Redigera ett vandrarhem"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Redigera alphydda"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Redigera en husvagnscamping"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Campingplats"
@@ -23415,10 +23351,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Redigera en campingplats"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Mat+Dryck"
@@ -23429,5 +23365,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurang"
@@ -23435,5 +23371,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Redigera en restaurang"
@@ -23441,5 +23377,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "Kök"
@@ -23447,73 +23383,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italienskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "kinesiskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "hamburgare"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "grekiskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "tyskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "indiskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "lokalt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "turkiskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asiatiskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thailändskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexikanskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanskt"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Snabbmat"
@@ -23521,17 +23457,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Redigera en snabbmatsrestaurang"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kafé"
@@ -23539,9 +23475,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Redigera kafé"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -23549,18 +23485,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Redigera pub"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Redigera Biergarten"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23568,9 +23504,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "Nattklubb"
@@ -23578,24 +23514,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "Redigera nattklubb"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turism"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "Sevärdhet"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "Redigera sevärdhet"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Museum"
@@ -23603,9 +23539,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Redigera museum"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Zoo"
@@ -23614,9 +23550,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Redigera zoo"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Utsiktsplats"
@@ -23624,24 +23560,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Redigera utsiktsplats"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Utsiktstorn"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Nöjespark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Redigera en nöjespark"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Konst"
@@ -23649,5 +23585,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Redigera konstverk"
@@ -23655,19 +23591,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Karta"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23705,5 +23641,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23711,28 +23647,28 @@
 msgstr "gata"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23742,5 +23678,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr "Rutter visas för:"
@@ -23748,5 +23684,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "Vandringsled"
@@ -23754,6 +23690,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Cykling"
@@ -23761,5 +23697,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23767,6 +23703,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Skidåkning"
@@ -23774,5 +23710,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23780,46 +23716,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "Informationstavla"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "historiskt"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "naturfenomen"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "djurliv"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23827,29 +23763,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Redigera vindskydd"
@@ -23857,25 +23793,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Eldstad"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Picknickplats"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Redigera picknickplats"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Historiska platser"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Slott"
@@ -23884,19 +23820,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Redigera slott"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Ruiner"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Redigera ruiner"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Utgrävningsplats"
@@ -23905,9 +23841,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Redigera utgrävningsplats"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Krigsskådeplats"
@@ -23915,10 +23851,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Redigera krigsskådeplats"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr "Paleografisk plats"
@@ -23926,5 +23862,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr "Redigera paleografisk plats"
@@ -23932,15 +23868,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Monument"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Redigera monument"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Minnesmärke"
@@ -23948,55 +23884,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Redigera minnesmärke"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Vägkors"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Redigera ett vägkors"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Vägaltare"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Redigera ett vägaltare"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Nöje"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Badanläggning"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Redigera badanläggning"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Lekplats"
@@ -24004,35 +23940,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Redigera lekplats"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Fiske"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Redigera fiske"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "Idrott"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Sportfaciliteteter"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadion"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Redigera stadion"
@@ -24046,6 +23982,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "välj sport:"
@@ -24437,6 +24373,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24470,225 +24406,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "flera"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "bågskytte"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "friidrott"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "australisk fotboll"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "baseball"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "boule"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kanot"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "klättring"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "cricket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "kricket_nät"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "krocket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "cykling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "hundracing"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "ridsport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "amerikansk fotboll"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "gymnastik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "ishockey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "hästkapplöpning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motorsport"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "rackets"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "skytte"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "skateboard"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "skridskoåkning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "skidåkning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "fotboll"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "simning"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "bordtennis"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tennis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "Sporthall"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "Redigera sporthall"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "Plan"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "Redigera plan"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "Bana"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "Redigera bana"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golfbana"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Redigera golfbana"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minigolf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Redigera minigolfbana"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Sport"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Flera"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Redigera flersportsfacilitet"
@@ -24727,21 +24663,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "typ"
@@ -24780,203 +24716,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "plan"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "sporthall"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadion"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Friidrott"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Redigera friidrott"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "Bågskytte"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "Redigera bågskytte"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "Klättring"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "Redigera klättring"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kanotpaddling"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Redigera kanotpaddling"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Redigera cykling"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Hundkapplöpning"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Redigera hundkapplöpning"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "Ridsport"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "Redigera ridsport"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "Hästkapplöpning"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "Redigera hästkapplöpning"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "Gymnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "Redigera gymnastik"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motorsport"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Redigera motorsport"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "Skridskoåkning"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "Redigera skridskoåkning"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "Skateboard"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "Redigera skateboard"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "Simning"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "Redigera simning"
@@ -24984,52 +24920,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Redigera skidåkning"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr "Skidspårstyp"
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr "utförsåkning"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr "längdskidåkning"
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "Svårighetsgrad"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "nybörjare"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "lätt"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "expert"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr "ospårat"
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Skytte"
@@ -25037,177 +24973,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Redigera skytte"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Bollsport"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Fotboll"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Redigera fotboll"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikansk fotboll"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Redigera amerikansk fotboll"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Australisk fotboll"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Redigera australisk fotboll"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Redigera baseball"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basket"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Redigera basket"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Redigera golf"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_bana"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Redigera boule"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr ""
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr ""
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Cricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Redigera cricket"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricketnät"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Redigera cricketnät"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Krocket"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "Redigera krocket"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Ishockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Redigera ishockey"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Redigera pelota"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Rackets"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Redigera rackets"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Redigera rugby"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Bordtennis"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Redigera bordtennis"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Redigera tennis"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Byggnad"
@@ -25215,5 +25151,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Offentlig byggnad"
@@ -25221,10 +25157,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Redigera offentlig byggnad"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "Stadshus"
@@ -25232,10 +25168,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "Redigera stadshus"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Ambassad"
@@ -25243,10 +25179,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Redigera ambassad"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "Domstol"
@@ -25255,10 +25191,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "Redigera domstol"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Fängelse"
@@ -25267,10 +25203,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Redigera fängelse"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polisstation"
@@ -25280,10 +25216,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Redigera polisstation"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "Brandstation"
@@ -25292,10 +25228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "Redigera brandstation"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postkontor"
@@ -25303,5 +25239,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Redigera postkontor"
@@ -25309,15 +25245,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Redigera barndaghem"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Skola"
@@ -25325,10 +25261,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "Redigera skola"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Högskola/universitet"
@@ -25336,10 +25272,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Redigera högskola/universitet"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "Högskola"
@@ -25347,5 +25283,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "Redigera högskola"
@@ -25353,5 +25289,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Biograf"
@@ -25360,10 +25296,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Redigera biograf"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "Bibliotek"
@@ -25372,9 +25308,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "Redigera bibliotek"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "Konstcenter"
@@ -25382,10 +25318,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "Redigera konstcenter"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Teater"
@@ -25394,10 +25330,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Redigera teater"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Religiös helgedom"
@@ -25407,5 +25343,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Redigera religiös helgedom"
@@ -25414,6 +25350,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Religion"
@@ -25422,66 +25358,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "buddism"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "kristendom"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hinduism"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "judendom"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "islam"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "daoism"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "zoroastrianism"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "Samfund"
@@ -25490,81 +25426,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikaner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptister"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katoliker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "evangelister"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "jehovas_vittnen"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "luteraner (inkl. Svenska kyrkan)"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "metodister"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormoner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "ortodoxa"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pinstvänner"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbytarianer"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestanter"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "kväkare"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shiamuslimer"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunnimuslimer"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adresser"
@@ -25573,5 +25509,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Redigera adressinformation"
@@ -25579,5 +25515,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Husnummer"
@@ -25585,25 +25521,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Husnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Gatunamn"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Stadsnamn"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Postnummer"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Landskod"
@@ -25612,5 +25548,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Redigera adressinterpolation"
@@ -25618,61 +25554,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numreringsschema"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "udda"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "jämn"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "Byggnadsverk"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Fabrik"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Redigera fabriksbyggnad"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Torn"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Redigera torn"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25680,25 +25616,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Vattentorn"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Redigera vattentorn"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gasklocka"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Redigera gasklocka"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "Fyrtorn"
@@ -25706,10 +25642,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "Fyrtorn"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Väderkvarn"
@@ -25717,10 +25653,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Redigera väderkvarn"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Rörledning"
@@ -25729,41 +25665,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Redigera rörledning"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "naturgas"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "Plats"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Reningsverk"
@@ -25773,10 +25709,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Redigera reningsverk"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Kran"
@@ -25784,5 +25720,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Redigera kran"
@@ -25790,10 +25726,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Redigera fyrbåk"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Mätpunkt"
@@ -25801,10 +25737,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Redigera mätpunkt"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Övervakning"
@@ -25812,23 +25748,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Redigera övervakningskamera"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Kraftverk"
@@ -25838,35 +25774,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Redigera ett kraftverk"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "vindkraft"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "vattenkraft"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fossila bränslen"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "kärnkraft"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kolkraft"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "solkraft"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Kraftstation"
@@ -25875,10 +25811,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Redigera en kraftstation"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Transformatorstation"
@@ -25887,5 +25823,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Redigera en transformatorstation"
@@ -25893,10 +25829,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Kraftledningsmast"
@@ -25907,23 +25843,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "Redigera en kraftledningsmast"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Kraftledning"
@@ -25932,74 +25868,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Redigera en kraftledning"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "Inrättningar"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Toaletter"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Anteckning"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Brevlåda"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -26008,5 +25944,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Redigera en telefon"
@@ -26014,5 +25950,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Mynt"
@@ -26020,5 +25956,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Anteckningar"
@@ -26026,5 +25962,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Betalkort"
@@ -26032,5 +25968,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "Kontokort"
@@ -26038,15 +25974,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kreditkort"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefonkort"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Återvinning"
@@ -26055,5 +25991,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Redigera en återvinningsstation"
@@ -26061,35 +25997,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Batterier"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Burkar"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Kläder"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Glas"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Papper"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Metallskrot"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -26097,5 +26033,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -26104,31 +26040,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26207,5 +26143,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26215,31 +26151,31 @@
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Jakttorn"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Redigera ett jakttorn"
@@ -26248,30 +26184,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Höjd"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "låg"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "halv"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "full"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Dölj"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Lås"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Fontän"
@@ -26280,10 +26216,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Redigera en fontän"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "Dricksvatten"
@@ -26292,10 +26228,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "Redigera dricksvattensfacilitet"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26304,5 +26240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26310,5 +26246,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26316,15 +26252,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Affärer"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26332,10 +26268,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "Redigera bilförsäljare"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26344,28 +26280,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Redigera cykelaffär"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Stormarknad"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Redigera stormarknad"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr "Hygien"
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr "Redigera hygienbutik"
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Närköp"
@@ -26373,9 +26309,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Redigera närköp"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26383,27 +26319,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Redigera kiosk"
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "Bokhandel"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "Redigera bokhandel"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "Resebyrå"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "Redigera resebyrå"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "Slakteri"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "Redigera slakteri"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "Bageri"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "Redigera bageri"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "Florist"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "Redigera florist"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "Alkohol"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "Redigera alkoholbutik"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "Drycker"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "Dator"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "Redigera datoraffär"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "Elektronik"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "Redigera elektronikaffär"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "Redigera hifi-affär"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "Möbler"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "Redigera möbelaffär"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "Trädgårdscenter"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "Redigera trädgårdscenter"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr "Järnvaror"
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr "Redigera järnaffär"
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "Gör-det-själv-affär"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "Redigera gör-det-själv-affär"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "Kontorsmaterial"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "Redigera pappershandel"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "Hårfrisör"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "Redigera hårfrisör"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "Skor"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "Redigera skoaffär"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "Leksaker"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "Redigera leksaksaffär"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "Videobutik"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "Redigera videobutik"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Kemtvätt"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Redigera kemtvätt"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Tvätteri"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Redigera tvätteri"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Friluftsliv"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Redigera affär för friluftsliv"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "Redigera sportaffär"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "Optiker"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "Redigera optiker"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Automat"
@@ -26411,5 +26561,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Redigera en automat"
@@ -26417,306 +26567,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Varor till försäljning"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "biljetter för allmänna transportmedel"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "parkeringsbiljetter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "mat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "dryck"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "godis"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "cigaretter"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "foton"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "djurmat"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "tidningar"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "leksaker"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "frimärken"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefonkort"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "cykel"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondomer"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tamponger"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "hundpåsar"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "Slakteri"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "Redigera slakteri"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "Bageri"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "Redigera bageri"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "Florist"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "Redigera florist"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "Alkohol"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "Redigera alkoholbutik"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "Drycker"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "Dator"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "Redigera datoraffär"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "Elektronik"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "Redigera elektronikaffär"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "Redigera hifi-affär"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "Möbler"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "Redigera möbelaffär"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "Trädgårdscenter"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "Redigera trädgårdscenter"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr "Järnvaror"
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr "Redigera järnaffär"
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "Gör-det-själv-affär"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "Redigera gör-det-själv-affär"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "Kontorsmaterial"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "Redigera pappershandel"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "Hårfrisör"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "Redigera hårfrisör"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "Skor"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "Redigera skoaffär"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "Leksaker"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "Redigera leksaksaffär"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "Videobutik"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "Redigera videobutik"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Kemtvätt"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Redigera kemtvätt"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Tvätteri"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Redigera tvätteri"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Friluftsliv"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Redigera affär för friluftsliv"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "Redigera sportaffär"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "Optiker"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "Redigera optiker"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Pengar"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Bank"
@@ -26724,14 +26666,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Redigera bank"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "Uttagsautomat"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Växlingskontor"
@@ -26739,5 +26681,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Redigera växlingskontor"
@@ -26745,15 +26687,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "Redigera uttagsautomat"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Hälsovård"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Läkare"
@@ -26761,18 +26703,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Redigera läkare"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Tandläkare"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Redigera tandläkare"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Apotek"
@@ -26780,5 +26722,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Redigera apotek"
@@ -26786,9 +26728,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Receptutlämnande"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Sjukhus"
@@ -26796,10 +26738,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Redigera sjukhus"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26808,5 +26750,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26815,20 +26757,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "Använd internationellt format, ex +12-345-67890"
@@ -26836,5 +26778,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veterinär"
@@ -26843,64 +26785,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Redigera veterinär"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "Geografi"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Platser"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kontinent"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Redigera en kontinent"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Land"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Redigera land"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "Delstat"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "Redigera delstat"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Region"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Redigera region"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "Län"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "Redigera län"
@@ -26908,15 +26850,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Stad"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Redigera stad"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Småstad"
@@ -26924,10 +26866,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Redigera småstad"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Förort"
@@ -26935,25 +26877,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Redigera förort"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Mindre tätort"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Redigera mindre tätort"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Småort"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Redigera småort"
@@ -26961,5 +26903,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Plats"
@@ -26967,10 +26909,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Redigera plats"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ö"
@@ -26978,10 +26920,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Redigera ö"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr "Holme"
@@ -26989,5 +26931,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr "Redigera holme"
@@ -26995,5 +26937,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Grottöppning"
@@ -27001,10 +26943,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Redigera en grottöppning"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Topp"
@@ -27012,10 +26954,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Redigera topp"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Glaciär"
@@ -27023,10 +26965,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Redigera en glaciär"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Vulkan"
@@ -27034,70 +26976,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Redigera en vulkan"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Gränser"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Nationell"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Redigera nationsgränser"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "Administrativ"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "Redigera administrativa gränser"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Civilrättslig"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Redigera en civilrättslig gräns"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "Politisk"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Redigera politiska gränser"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "Nationalpark"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Redigera gräns för nationalpark"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Markanvändning"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Träd"
@@ -27106,15 +27048,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Redigera ett träd"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botaniskt namn"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Naturskog"
@@ -27123,5 +27065,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Redigera naturskog"
@@ -27129,17 +27071,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "barrskog"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "lövskog"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "blandskog"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "Kulturskog"
@@ -27148,14 +27090,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "Redigera användning av mark för skogsbruk"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "Naturreservat"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "Redigera naturreservat"
@@ -27163,25 +27105,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Bergsluttning (med lösa stenar)"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Redigera bergssluttning (med lösa stenar)"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Buskage"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Redigera buskage"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Höglandshed"
@@ -27189,10 +27131,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Redigera en höglandshed"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Hed"
@@ -27200,5 +27142,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Redigera hed"
@@ -27206,5 +27148,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Gårdsplan"
@@ -27213,45 +27155,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Redigera markanvändning som gårdsplan"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Jordbruksmark"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Redigera användning av mark för jordbruk"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr "Äng"
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr "Redigera markanvändning som äng"
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Vingård"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Redigera användning av mark för vingård"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Kolonilotter"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Redigera användning av mark för koloniområden"
@@ -27259,25 +27201,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Trädgård"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Redigera trädgård"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Gräs"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Redigera markanvändning som gräsyta"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Allmänning"
@@ -27285,10 +27227,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Redigera användning av mark för allmänning"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Allmänning"
@@ -27296,20 +27238,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Redigera allmänning"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Redigera park"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "Fritidsområde"
@@ -27317,5 +27259,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "Redigera användning av mark för fritidsområde"
@@ -27323,15 +27265,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Bostadsområde"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Redigera användning av mark för bostadsområde"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Kyrkogård"
@@ -27339,9 +27281,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Redigera kyrkogård"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Begravningsplats"
@@ -27349,39 +27291,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Redigera användning av mark för begravningsplats"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Detaljhandel"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Redigera användning av mark för detaljhandel"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Affärsområde"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Redigera användning av mark för affärsområde"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Industriområde"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Redigera användning av mark för industriområde"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Järnvägsmark"
@@ -27389,15 +27331,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Redigera användning av mark för järnvägsmark"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Militärt område"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Redigera användning av mark för militärt område"
@@ -27405,50 +27347,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "Byggnadsplats"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "Redigera markanvändning som byggnadsplats"
 
 #. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
+#: build/trans_presets.java:3153
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
 msgid "Edit Greenfield Landuse"
 msgstr ""
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Deponi"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Redigera användning av mark för deponi av avfall"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Stenbrott"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "Redigera användning av mark för stenbrott"
@@ -27458,5 +27400,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr "Redigera en multipolygon"
@@ -27465,10 +27407,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr "yttre segement"
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr "inre segment"
@@ -27476,5 +27418,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27483,5 +27425,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27489,34 +27431,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr "Begränsning"
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr "ingen_vänstersväng"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr "ingen_högersväng"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr "inte_rakt_fram"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr "ingen_u_sväng"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr "enbart_högersväng"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr "enbart_vänstersväng"
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr "enbart_rakt_fram"
@@ -27525,15 +27467,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr "från sträcka"
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr "via nod eller sträcka"
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr "till sträcka"
@@ -27541,5 +27483,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr "Rutt"
@@ -27548,5 +27490,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr "Redigera rutt"
@@ -27554,5 +27496,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr "Ruttyp"
@@ -27643,5 +27585,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27651,17 +27593,17 @@
 msgstr "cykel"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "buss"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27721,5 +27663,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27728,9 +27670,9 @@
 msgstr "fot"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27744,10 +27686,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "tunnelbana"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27755,31 +27697,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27788,31 +27730,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
Index: /applications/editors/josm/i18n/po/tr.po
===================================================================
--- /applications/editors/josm/i18n/po/tr.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/tr.po	(revision 20945)
@@ -10,7 +10,7 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-07 01:54+0000\n"
-"Last-Translator: Göksel GÜREN <Unknown>\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:36+0000\n"
+"Last-Translator: bastik <Unknown>\n"
 "Language-Team: Türkçe\n"
 "MIME-Version: 1.0\n"
@@ -18,5 +18,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
@@ -68,5 +68,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1192,5 +1192,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "Objeleri dünya dışına taşıyamazsın."
@@ -1502,5 +1502,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2247,9 +2247,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2332,27 +2332,27 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "Genişlet"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "Alanları Oluştur"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "Yolu genişlet"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr ""
 "İstediğiniz boyutta bir dikdörtgen çizin, sonra fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2372,6 +2372,6 @@
 "senkronize etmek için."
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2383,9 +2383,9 @@
 msgstr "Seçiniz"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "Objeyi seç,taşı ve dönder"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2394,17 +2394,17 @@
 msgstr[1] ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "Taşı"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "Taşımayı geri al"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2414,9 +2414,9 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "Dikdörtgendeki objeleri seçmek için fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
@@ -2425,9 +2425,9 @@
 "yapıştır."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "Dönmeyi durdurmak için fare düğmesini bırakınız."
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3151,5 +3151,5 @@
 msgstr "Uygula?"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3718,17 +3718,14 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:15
-#, fuzzy
 msgid "Node: standard"
-msgstr "standard"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "Bağlı Değil"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "imaj henuz etiketlenmedi"
+msgstr ""
 
 #. teal
@@ -3909,5 +3906,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "demiryolu"
@@ -5187,5 +5184,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "hepsi"
@@ -5598,4 +5595,9 @@
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5686,5 +5688,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "İlişkiler"
@@ -5786,14 +5788,14 @@
 msgstr "Seçim: {0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "Panelin kilidini Kaldır"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "Paneli Kapat. Soldaki araç çubuğundan tekrar açabilirsiniz."
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "paneli büyütüp/küçültmek için tıklayınız"
@@ -6123,4 +6125,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6133,10 +6141,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6806,145 +6808,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "İsim"
@@ -8155,10 +8157,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "Tip"
@@ -8166,5 +8168,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8178,17 +8179,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "bilinmeyen"
@@ -8953,11 +8953,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -8974,14 +8976,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "Tabaka"
@@ -9514,5 +9516,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr ""
@@ -10573,55 +10575,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11099,5 +11101,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "Araba"
@@ -11119,16 +11121,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "Bisiklet"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11158,12 +11161,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "Ayak"
@@ -11863,12 +11866,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "Sokak Adı"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "ölçülen değerler"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14122,6 +14123,7 @@
 msgstr "İzleri Yükle"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr ""
@@ -14212,5 +14214,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr "Adres İnterpolasyon"
@@ -14397,5 +14399,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14436,19 +14438,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "Binalar"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14456,5 +14458,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14467,10 +14469,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14653,5 +14655,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16484,5 +16486,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "Toplu taşıma"
@@ -16534,5 +16536,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "Yol noktaları"
@@ -17105,4 +17107,21 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "Tip"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+msgid "From:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17259,4 +17278,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "Seçili ilişkiyi sil"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18013,5 +18045,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19297,7 +19329,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "Referans"
@@ -19314,5 +19346,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "Şeritler"
@@ -19330,4 +19362,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19335,9 +19368,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "Max. hız (km/sa)"
@@ -19365,15 +19397,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19384,11 +19410,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "TekYol"
@@ -19408,15 +19433,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19433,11 +19456,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19458,8 +19481,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19477,11 +19500,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "Tunel"
@@ -19501,6 +19524,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19518,11 +19541,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "Kesen"
@@ -19542,6 +19565,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19559,11 +19582,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "toprak set"
@@ -19701,5 +19724,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19708,12 +19731,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19721,13 +19747,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr ""
@@ -19756,24 +19782,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "Yüzey"
@@ -19785,5 +19807,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19797,11 +19819,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "kaldırım"
@@ -19809,10 +19830,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "kaldırımsız"
@@ -19820,10 +19841,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19831,11 +19852,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr ""
@@ -19843,10 +19863,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr ""
@@ -19854,10 +19874,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "orman"
@@ -19865,10 +19885,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19876,11 +19896,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "parke taşı"
@@ -19888,10 +19907,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "Çakıl"
@@ -19899,10 +19918,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19910,10 +19929,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -19921,10 +19940,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -19932,10 +19951,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "ot"
@@ -19943,10 +19962,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "kum"
@@ -19954,10 +19973,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "toprak"
@@ -20038,6 +20057,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "yol (tipi bilinmiyor)"
@@ -20046,5 +20064,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "Tipi olmayan yolu düzenle"
@@ -20052,6 +20070,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "İnşaat"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "Otoyolda onarım var olarak düzenle"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "Kavşak"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "döner kavşak"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "Yol kısıtlamaları"
@@ -20060,15 +20107,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "Yol kısıtlamalarını düzenle"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "ücret"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "Çıkış Yok"
@@ -20076,5 +20123,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr "Erişim"
@@ -20116,28 +20163,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "Evet"
@@ -20150,10 +20196,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20167,10 +20213,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20194,97 +20240,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr "ihtiyari"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "tarımsal"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "hayır"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "atanmış"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "mallar"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "Ağır araç"
@@ -20299,10 +20345,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "AT"
@@ -20318,10 +20364,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "Motosiklet"
@@ -20336,19 +20382,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "otomobil"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "Toplu taşıma araçları"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "Min. Hız (km/h)"
@@ -20356,20 +20402,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "Max. ağırlık (ton)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr ""
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr ""
@@ -20377,5 +20423,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "Döner Kavşak"
@@ -20386,5 +20432,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "Kavşak Düzenle"
@@ -20404,10 +20450,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "araçyolu"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "otoyol_hat"
@@ -20429,10 +20475,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "ana_hat"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "anayol_hat"
@@ -20454,10 +20500,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "birincil"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "birincil_hat"
@@ -20479,5 +20525,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20492,9 +20538,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "üçüncül"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "sınıflandırılmamış"
@@ -20508,9 +20554,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "yerleşim_alanı"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "canlı_sokak"
@@ -20540,10 +20586,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "servis"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "otobüs_hattı"
@@ -20573,5 +20619,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20583,10 +20629,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "Köprü Düzenle"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr ""
@@ -20594,39 +20640,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "Yollar"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "İnşaat"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "Otoyolda onarım var olarak düzenle"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "Kavşak"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "döner kavşak"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "İz"
@@ -20635,73 +20652,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "İz düzenle"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "Yol"
@@ -20710,38 +20695,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "Yol düzenle"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr ""
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr ""
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "Kayak"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "kar motosikleti"
@@ -20750,5 +20765,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20756,5 +20771,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "At yolu düzenle"
@@ -20762,5 +20777,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20778,11 +20793,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "Bisiklet yolu düzenle"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20790,5 +20805,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20796,5 +20811,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20802,5 +20817,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20809,15 +20824,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "Yürüyüş Yolu Düzenle"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "adımlar"
@@ -20827,10 +20838,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "Uçuş adımları düzenle"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "Otoyol Kavşağı"
@@ -20838,15 +20849,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "Otoyol Kavşağı birleştirme"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "Numara"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "Servis"
@@ -20854,5 +20865,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "Sevis istasyonu düzenle"
@@ -20892,17 +20903,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "Operator"
@@ -20911,5 +20922,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "Trafik ışıkları"
@@ -20919,5 +20930,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr ""
@@ -20926,27 +20937,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "kontrolsuz"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr ""
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "ada"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -20954,6 +20965,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr ""
@@ -20962,11 +20973,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr ""
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr ""
@@ -20974,30 +20985,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "zebra"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr "pelikan"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "Dur"
@@ -21005,5 +21016,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr ""
@@ -21012,14 +21023,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr ""
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr ""
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21027,33 +21038,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21061,5 +21072,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21067,5 +21078,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr ""
@@ -21076,14 +21087,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr ""
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr ""
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr "Dönme Daire"
@@ -21093,5 +21104,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "şehir sınırı"
@@ -21099,15 +21110,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "şehir sınırı düzenle"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "ikinci isim"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "hız kamerası"
@@ -21116,5 +21127,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "Acil durum telefonu"
@@ -21122,5 +21133,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr ""
@@ -21128,5 +21139,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr ""
@@ -21134,5 +21145,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21142,10 +21153,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "sığ geçit"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "sığ geçit düzenle"
@@ -21153,5 +21164,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "Dağ geçidi"
@@ -21159,5 +21170,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "dağ geçidi düzenle"
@@ -21169,7 +21180,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "yükseklik"
@@ -21177,5 +21188,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "Bariyer"
@@ -21183,5 +21194,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "direk-iskele"
@@ -21189,5 +21200,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "direk-iskele düzenle"
@@ -21232,16 +21243,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "İzin verilen trafik:"
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr ""
@@ -21250,5 +21261,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "Blok"
@@ -21256,5 +21267,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "Hayvan Kapısı"
@@ -21262,10 +21273,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "Hayvan Kapısı Düzenle"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "otobüs geçidi"
@@ -21273,15 +21284,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "Spikes"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr ""
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "gişe"
@@ -21289,5 +21300,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "gişe  düzenle"
@@ -21295,10 +21306,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "Sınır kontrol noktası"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "Sınır kontrol noktası düzenle"
@@ -21308,5 +21319,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "Çalı Çit"
@@ -21317,22 +21328,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "Çit"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "Duvar"
@@ -21340,5 +21351,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "Şehir Duvarı"
@@ -21347,5 +21358,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "istinat duvarı"
@@ -21357,10 +21368,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "Giriş"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "Giriş düzenle"
@@ -21368,5 +21379,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "Geçit"
@@ -21374,50 +21385,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "Geçit Düzenle"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr "Kalkan geçit"
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr "kalkan geçit düzenle"
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr "Hampshire Geçidi"
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr "Hampshire Geçidi Düzenle"
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr "Hız engeli"
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr "Hız engeli düzenle"
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr "geçit"
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr "geçit düzenle"
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr "Stil"
@@ -21425,25 +21436,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr "Stil düzenle"
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "Çıkış Kapısı-asker"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "Çıkış Kapısı-asker düzenle"
@@ -21454,11 +21465,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "Su"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "Spring"
@@ -21466,5 +21477,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "Spring Düzenle"
@@ -21472,5 +21483,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr "kanalizasyon"
@@ -21478,10 +21489,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr "kanalizasyon düzenle"
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21489,10 +21500,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "dere"
@@ -21500,10 +21511,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "dere düzenle"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "Kanal"
@@ -21511,10 +21522,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "Kanal düzenle"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "nehir"
@@ -21524,5 +21535,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "nehir düzenle"
@@ -21530,15 +21541,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "Su Düzenle"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "Kara"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "Kara Düzenle"
@@ -21546,15 +21557,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr "havza"
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr "havza kullanım düzenle"
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "Havuz"
@@ -21562,15 +21573,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "Havuz Kullanımı Düzenle"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "Kapalı Sarnıç"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "Kapalı Sarnıç Düzenle"
@@ -21578,5 +21589,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "Nehirkenarı"
@@ -21585,10 +21596,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "Nehirkenarı Düzenle"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "sulak alan"
@@ -21599,14 +21610,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "sulak alan düzenle"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "bataklık"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "kenef"
@@ -21620,35 +21631,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr "batak"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr "sazlık alan"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr "çolak alan"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr "gelgit alanı"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "bataklık ormanı"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr "Çamur"
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr "Çamur Alan Düzenle"
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "Sahil"
@@ -21656,20 +21667,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "Sahil Düzenle"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "Koy"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "koy Düzenle"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "Uçurum"
@@ -21677,10 +21688,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "Uçurum Düzenle"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "Sahil Çizgisi"
@@ -21688,5 +21699,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "Sahil Çizgisi Düzenle"
@@ -21694,5 +21705,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "feribot hat"
@@ -21700,5 +21711,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "feribot hat düzenle"
@@ -21707,5 +21718,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr "Marina"
@@ -21713,10 +21724,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr "Marina düzenle"
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "iskele"
@@ -21724,5 +21735,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "iskele düzenle"
@@ -21730,5 +21741,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "Baraj"
@@ -21736,15 +21747,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "Baraj düzenle"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "Su yolu noktası"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "Lock Gate"
@@ -21753,5 +21764,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "bent"
@@ -21759,20 +21770,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "bent dünele"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "şelale"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "şelale düzenle"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr "dönüm noktası"
@@ -21781,15 +21792,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "Marina"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "Marina düzenle"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "Kemer"
@@ -21797,10 +21808,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "Kemer Düzenle"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "Feribot Terminal"
@@ -21808,10 +21819,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "Feribot Terminal düzenle"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "Gemi Kızağı"
@@ -21821,20 +21832,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "Gemi Kızağı Düzenle"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr ""
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "Demiryolu"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "Demiryolu"
@@ -21842,5 +21853,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "Demiryolu düzenle"
@@ -21870,86 +21881,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr "standard"
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -21961,8 +21897,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -21976,29 +21912,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr "saha"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr "yük boşaltma yeri"
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr "demiryolu hattı şube-kısa"
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22011,8 +21947,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22083,8 +22019,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22096,8 +22032,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "Voltaj"
@@ -22110,8 +22046,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22124,23 +22060,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "Dar geçiş demiryolu düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "tek ray"
@@ -22148,50 +22084,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "tek ray düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "Korunmuş"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "Korunmuş demiryolu düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "Hafif Ray"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "Hafif Ray Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "Metro"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "Metro Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "Tramvay"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "Tramvay Düzenle"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "Otobüs Yolu"
@@ -22199,5 +22135,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "Otobüs Yolu Düzenle"
@@ -22206,10 +22142,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "Kullanılmayan Demiryolu"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "Kullanılmayan Demiryolu Düzenle"
@@ -22218,9 +22154,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "seçmeli tipler"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "Terkedilmiş demiryolu düzenle"
@@ -22229,5 +22165,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "hemzemin geçit"
@@ -22236,5 +22172,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "geçit"
@@ -22244,5 +22180,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr ""
@@ -22250,5 +22186,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "döner levha"
@@ -22257,5 +22193,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22264,10 +22200,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "havayolu"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "Teleski"
@@ -22275,10 +22211,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "Teleski Düzenle"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr "Kayakçı Asansörü"
@@ -22286,10 +22222,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr "Kayakçı Asansörü Düzenle"
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "Hava tramvayı"
@@ -22297,10 +22233,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "Hava tramvayı düzenle"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22308,10 +22244,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22320,5 +22256,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22326,5 +22262,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22333,5 +22269,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22339,5 +22275,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "Yakıt"
@@ -22347,62 +22283,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "Yakıt düzenle"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22460,32 +22396,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr "Açılış saati"
@@ -22544,165 +22480,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22719,5 +22655,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22727,5 +22663,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "Park düzenle"
@@ -22736,25 +22672,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr "Referans Numarası"
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "kat otoparkı"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "yüzey"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "yer altı"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22763,48 +22699,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "Ücret"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "Özürlü Alanı"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "Yıkama"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "Yıkama düzenle"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "tamirci"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "tamirci düzenle"
@@ -22812,5 +22748,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "araç kiralam"
@@ -22819,10 +22755,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "araç kiralam düzenle"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr "Paylaşım Alanı"
@@ -22830,5 +22766,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr "Araç Paylaşım alanı düzenle"
@@ -22836,10 +22772,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "Bisiklet parkyeri düzenle"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "kapasite"
@@ -22848,10 +22784,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "bisiklet kiralama düzenle"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22861,5 +22797,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22867,5 +22803,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr "UIC-Referans"
@@ -22873,5 +22809,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr "Demiryolu sonu"
@@ -22879,5 +22815,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr "Son nokta düzenle"
@@ -22885,5 +22821,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "Tramvay durağı"
@@ -22892,5 +22828,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "tramvay durağı düzenle"
@@ -22898,5 +22834,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "Demiryolu platformu"
@@ -22905,5 +22841,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "Demiryolu platformu düzenle"
@@ -22915,5 +22851,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr "referans (iz numarası)"
@@ -22921,10 +22857,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "Alan"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "Metro Girişi"
@@ -22933,10 +22869,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "Metro Girişi Düzenle"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr "tekerlekli sandalye"
@@ -22945,5 +22881,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "otogar"
@@ -22952,5 +22888,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "otogar düzenle"
@@ -22958,5 +22894,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "otobüs durağı"
@@ -22966,5 +22902,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "otobüs durağı düzenle"
@@ -22973,6 +22909,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr "Sığınak"
@@ -22980,19 +22916,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "banket"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "otobüs platformu"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "otobüs platformu düzenle"
@@ -23000,5 +22936,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "Taksi"
@@ -23006,5 +22942,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "taksi istasyonu düzenle"
@@ -23012,10 +22948,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "Havaalanı"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23023,5 +22959,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23029,10 +22965,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr "IATA"
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr "ICAO"
@@ -23041,5 +22977,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23047,5 +22983,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23053,5 +22989,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23059,5 +22995,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23065,5 +23001,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23071,5 +23007,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23079,5 +23015,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23087,5 +23023,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23096,6 +23032,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr "Fener"
@@ -23105,5 +23041,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23112,5 +23048,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23118,5 +23054,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23124,15 +23060,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
+#: build/trans_presets.java:1572
+msgid "Edit Terminal Gate"
+msgstr ""
+
+#. item "Airport/Gate" text "Reference"
+#: build/trans_presets.java:1578
+msgid "Travel"
+msgstr ""
+
+#. group "Travel"
 #: build/trans_presets.java:1579
-msgid "Edit Terminal Gate"
-msgstr ""
-
-#. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
-msgid "Travel"
-msgstr ""
-
-#. group "Travel"
-#: build/trans_presets.java:1586
 msgid "Accomodation"
 msgstr "Kalınacak Yerler"
@@ -23144,5 +23080,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "Hotel"
@@ -23151,15 +23087,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "Hotel Düzenle"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "Stars"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "Motel"
@@ -23167,20 +23103,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "Motel Düzenle"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr "Misafir Evi"
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr "Misafir Evi Düzenle"
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr "kulübe"
@@ -23188,10 +23124,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr "külübe düzenle"
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr "Hostel"
@@ -23199,30 +23135,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr "Hostel Düzenle"
 
 #. item "Travel/Accomodation/Hostel" text "Name"
-#: build/trans_presets.java:1618
+#: build/trans_presets.java:1611
 msgid "Alpine Hut"
 msgstr "Dağcı Barakası"
 
 #. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
+#: build/trans_presets.java:1612
 msgid "Edit Alpine Hut"
 msgstr "Dağcı Barakası Düzenle"
 
 #. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
+#: build/trans_presets.java:1617
 msgid "Caravan Site"
 msgstr "Karavan Alanı"
 
 #. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
+#: build/trans_presets.java:1618
 msgid "Edit Caravan Site"
 msgstr "Karavan Alanı Düzenle"
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "Kamp Sitesi"
@@ -23230,10 +23166,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "Kamp Sitesi Düzenle"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "Yüyecek+içecek"
@@ -23244,5 +23180,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "Restaurant"
@@ -23250,5 +23186,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "Restorant Düzenle"
@@ -23256,5 +23192,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "lokanta"
@@ -23262,73 +23198,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "italyan"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "çinli"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "pizza"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "burger"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "yunan"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "alman"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "hint"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "yöresel"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr "kebab"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "türk"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "asyalı"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "thai"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "mexican"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "japanese"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "Fast Food"
@@ -23336,17 +23272,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "Fast Food düzenle"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "Kafe"
@@ -23354,9 +23290,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "Cafe düzenle"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "Pub"
@@ -23364,18 +23300,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "Pub Düzenle"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr "Biergarten"
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr "Biergarten Düzenle"
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr ""
@@ -23383,9 +23319,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr ""
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "GeceKlubu"
@@ -23393,24 +23329,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "GeceKulubu Düzenle"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "Turizm"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "İlginç Yerler"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "İlginç Yerler Düzenle"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "Müse"
@@ -23418,9 +23354,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "Müze Düzenle"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "Hayvanat Bahçesi"
@@ -23429,9 +23365,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "Hayvanat Bahçesi Düzenle"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "Seyir Yeri"
@@ -23439,24 +23375,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "Seyir Yeri Düzenle"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr "Seyir Kulesi"
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "Lunapark"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "Lunapark Düzenle"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "Sanatsal"
@@ -23464,5 +23400,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "Sanatsal Düzenle"
@@ -23470,19 +23406,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
+#: build/trans_presets.java:1723
+msgid "Information Office"
+msgstr ""
+
 #: build/trans_presets.java:1730
-msgid "Information Office"
-msgstr ""
-
-#: build/trans_presets.java:1737
 msgid "Map"
 msgstr "Harita"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23520,5 +23456,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23526,28 +23462,28 @@
 msgstr "sokak"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23557,5 +23493,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23563,5 +23499,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "gezme"
@@ -23569,6 +23505,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "Bisiklet"
@@ -23576,5 +23512,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23582,6 +23518,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "Kayak"
@@ -23589,5 +23525,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23595,46 +23531,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "tarih"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "doğa"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "vahşiyaşam"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23642,29 +23578,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr ""
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr ""
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr "Sığınak Düzenle"
@@ -23672,25 +23608,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr "Mangal Alanı"
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "Piknik Alanı"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "Piknik Alanı Düzenle"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "Tarihi Alanlar"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "Kale"
@@ -23699,19 +23635,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "Kale Düzenle"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "Harabe"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "Harabe Düzenle"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "Arkeolojik Site"
@@ -23720,9 +23656,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "Arkeolojik Site Düzenle"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "Savaş Alanı"
@@ -23730,10 +23666,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "Savaş Alanı Düzenle"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23741,5 +23677,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23747,15 +23683,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "Anıt"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "Anıt Düzenle"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "Abide"
@@ -23763,55 +23699,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "Abide Düzenle"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr "Yol Kenar Geçişi"
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr "Yol Kenar Geçişi Düzenle"
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri"
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr "Yolkenarı İbadetyeri Düzenle"
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "Dinlenme Alanı"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "Su Parkı"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "Su Parkı Düzenle"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "Oyun Sahası"
@@ -23819,35 +23755,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "Oyun Sahası Düzenle"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "Balıkçılık"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "Balıkçılık Düzenle"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr ""
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "Spor Aktivite"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "Stadyum"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "Stadyum Düzenle"
@@ -23861,6 +23797,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "Spor Seç"
@@ -24252,6 +24188,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24285,225 +24221,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "çoğul"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "okçuluk"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "atletik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "avustralya_footbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "basebol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "basketbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr "bowling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "çimen bowling"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "kano"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "tırmanma"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr "kriket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr "cricket nets"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "croquet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "bisiklet"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "köpek yarışı"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "at binicilik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "futbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "golf"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "jimnastik"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "hokey"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "at_yarışı"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "motor"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr "pelota"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr "raket"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "rugby"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr "kaykay"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr "paten"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "kaymak"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "futbol"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "yüzmek"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "masa_tenisi"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "tenis"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "spor merkezi"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "spor merkezi düzenle"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr "atıcılık"
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr "atıcılık düzenle"
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "yarış pisti"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "yarış pisti düzenle"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "Golf Alanı"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "Golf Alanı Düzenle"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "Minyatür Golf"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "Minyatür Golf Düzenle"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "Spor"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "Çoğul"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "Çoğul Düzenle"
@@ -24542,21 +24478,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "tip"
@@ -24595,203 +24531,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr "atıcılık"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "spor_merkezi"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "stadyum"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr "10pin"
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr "10pin Düzenle"
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "Atletik"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "Atletik Düzenle"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "okçuluk"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "okçuluk düzenle"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "tırmanma"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "tırmanma düzenle"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "Kano"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "Kano Düzenle"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "Bisiklet Düzenle"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "Köpek Yarışı"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "Köpek Yarışı Düzenle"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "binicilik"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "binicilik düzenle"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "At Yarışı"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "At Yarışı Düzenle"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "jimnastik"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "jimnastik düzenle"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "Motor Sporlar"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "Motor Sporları Düzenle"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "patinaj"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "patinaj düzenle"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "kaykay"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "kaykay düzenle"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "yüzme"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "yüzme düzenle"
@@ -24799,52 +24735,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "Kayak Düzenle"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "Atıcılık"
@@ -24852,177 +24788,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "Atıcılık Düzenle"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "Spor (Topla)"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "Futbol"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "Futbol Düzenle"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "Amerikan Futbolu"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "Amerikan Futbolu Düzenle"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "Avustralyan Futbol"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "Avustralyan Futbol Düzenle"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "Baseball"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "Baseball Düzenle"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "Basketbol"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "Basketbol Düzenle"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "Golf"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "Golf Düzenle"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "golf_alanı"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr "Boule"
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr "Boule Düzenle"
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "Bowling"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "Bowling Düzenle"
 
-#: build/trans_presets.java:2109
+#: build/trans_presets.java:2102
 msgid "Cricket"
 msgstr "Kricket"
 
 #. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
+#: build/trans_presets.java:2103
 msgid "Edit Cricket"
 msgstr "Kricket Düzenle"
 
-#: build/trans_presets.java:2115
+#: build/trans_presets.java:2108
 msgid "Cricket Nets"
 msgstr "Cricket Nets"
 
 #. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
+#: build/trans_presets.java:2109
 msgid "Edit Cricket Nets"
 msgstr "Cricket Nets Düzenle"
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "Kroke"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "kroke Düzelt"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "Hockey"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "Hockey Düzenle"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "Pelota"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "Pelota Düzenle"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr "Raket"
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr "Raket Düzenle"
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "Rugby"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "Rugby Düzenle"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "Masa Tenisi"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "Masa Tenisi Düzenle"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "Tennis"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "Tennis Düzenle"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr ""
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "Bina"
@@ -25030,5 +24966,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "Kamu Binası"
@@ -25036,10 +24972,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "Kamu Binası Düzenle"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "belediye binası"
@@ -25047,10 +24983,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "belediye binası düzenle"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "Büyükelçilik"
@@ -25058,10 +24994,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "Büyükelçilik Düzenle"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "adliye sarayı"
@@ -25070,10 +25006,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "adliye sarayı düzenle"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "Hapishane"
@@ -25082,10 +25018,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "Hapishane Düzenle"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "Polis"
@@ -25095,10 +25031,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "Polis Düzenle"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "İtfaye İstasyonu"
@@ -25107,10 +25043,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "İtfaye İstasyonu Düzenle"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "Postane"
@@ -25118,5 +25054,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "Postane Düzenle"
@@ -25124,15 +25060,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "Anaokul"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "Anaokul Düzenle"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "Okul"
@@ -25140,10 +25076,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "okul düzenle"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "Universite"
@@ -25151,10 +25087,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "Universite Düzenle"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "kolej"
@@ -25162,5 +25098,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "kolej düzenle"
@@ -25168,5 +25104,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "Sinema"
@@ -25175,10 +25111,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "Sinema Düzenle"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "kütüphane"
@@ -25187,9 +25123,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "kütüphane düzenle"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "sanat merkezi"
@@ -25197,10 +25133,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "sanat merkezi düzenle"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "Tiyatro"
@@ -25209,10 +25145,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "Tiyatro Düzenle"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "Tapınak"
@@ -25222,5 +25158,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "Tapınak Düzenle"
@@ -25229,6 +25165,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "Din"
@@ -25237,66 +25173,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "bahai"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "budist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "hristiyan"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "hindu"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "jain"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "yahudi"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "müslüman"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "sikh"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr "spiritualist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "taoist"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "Zerdüştlük"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "mezhep"
@@ -25305,81 +25241,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "anglikan"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "baptist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "katholik"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "protestan"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr "yahova_şahitleri"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "lutheran"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "methodist"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "mormon"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "orthodox"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "pentecostal"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "presbyterian"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "protestant"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "quaker"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "shia"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "sunni"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "Adres"
@@ -25388,5 +25324,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "Adres Bilgileri Düzenle"
@@ -25394,5 +25330,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr "Ev no:"
@@ -25400,25 +25336,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr "Ev İsmi"
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "Sokak Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "Şehir Adı"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "Posta Kodu"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "Ülke Kodu"
@@ -25427,5 +25363,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr "Adres İnterpolasyon Düzenle"
@@ -25433,61 +25369,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "Numara şeması"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "tek"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "çift"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr ""
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "İnsan Yapımı"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "Tesis"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "Tesis Düzenle"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "Kule"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "Kule Düzenle"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr ""
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr ""
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr ""
@@ -25495,25 +25431,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "Su Kulesi"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "Su Kulesi Düzenle"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "Gazdeposu"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "Gazdeposu Düzenle"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "DenizFeneri"
@@ -25521,10 +25457,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "DenizFeneri Düzenle"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "Yeldeğerimeni"
@@ -25532,10 +25468,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "Yeldeğerimeni Düzenle"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "Suboru Hattı"
@@ -25544,41 +25480,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "Suboru hattı Düzenle"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "benzin"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "Kanalizasyon Plant"
@@ -25588,10 +25524,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "Kanalizasyon Plant Düzenle"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "Vinç"
@@ -25599,5 +25535,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "Vinç Düzenle"
@@ -25605,10 +25541,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr "Fener Düzenle"
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "Poligon Noktası"
@@ -25616,10 +25552,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "Poligon Noktası Düzenle"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "Gözetim"
@@ -25627,23 +25563,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "Gözetim Kamera Düzenle"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "Güç Jeneratorü"
@@ -25653,35 +25589,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "Güç Jeneratorü Düzenle"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "rüzgar"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "hidro"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "fosil"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "nükleer"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "kömür"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "güneş enerjisi"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr "Güç İstasyonu"
@@ -25690,10 +25626,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr "Güç İstasyonu Düzenle"
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr "Alt Güç İstasyonu"
@@ -25702,5 +25638,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr "Alt Güç İstasyonu Düzenle"
@@ -25708,10 +25644,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr "çizgi referansı"
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "Güç Kulesi"
@@ -25722,23 +25658,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "güç Kulesi Düzenle"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "Güç Hattı"
@@ -25747,74 +25683,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "Güç Hattı Düzenle"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "hoş mekan"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "Tuvalet"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr "Not"
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "Posta Kutusu"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "Telefon"
@@ -25823,5 +25759,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "Telefon Düzenle"
@@ -25829,5 +25765,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "Madeni Para"
@@ -25835,5 +25771,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr "Notlar"
@@ -25841,5 +25777,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "Elektronik cüzdan ve Para Değişim Kartları"
@@ -25847,5 +25783,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr "ATM kartı"
@@ -25853,15 +25789,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "Kredi Kartı"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "Telefon kart"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "Geri Dönüşüm"
@@ -25870,5 +25806,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "Geri Dönüşüm İstasyonu"
@@ -25876,35 +25812,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "Piller"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "Çöp Tenekesi"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "Kıyafet"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "Cam"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "Kağıt"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "Hurda Metal"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25912,5 +25848,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25919,31 +25855,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr ""
@@ -26022,5 +25958,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26030,31 +25966,31 @@
 msgstr "yeşil"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr ""
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr ""
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr ""
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr "Av Standı"
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr "Av Standı Düzenle"
@@ -26063,30 +25999,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "Yükseklik"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "alçak"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "yarım"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "tam"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "Sakla"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "Kilitle"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "Kaynak"
@@ -26095,10 +26031,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "Kaynak Düzenle"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "İçme Suyu"
@@ -26107,10 +26043,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "İçme Suyu Düzenle"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26119,5 +26055,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26125,5 +26061,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr "Bebek Yuvası"
@@ -26131,15 +26067,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr "Bebek Yuvası Düzenle"
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "Dükkanlar"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26147,10 +26083,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "araçlı alışveriş düzenle"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26159,28 +26095,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "Bisiklet dükkanı düzenle"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "Supermarket"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "Supermarket Düzenle"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "Bakkal"
@@ -26188,9 +26124,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "Bakkal Düzenle"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr "Kiosk"
@@ -26198,27 +26134,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr "Kiosk Düzenle"
 
+#: build/trans_presets.java:2564
+msgid "Book Store"
+msgstr ""
+
+#. item "Shops/Book Store"
+#: build/trans_presets.java:2565
+msgid "Edit Book Store"
+msgstr ""
+
+#: build/trans_presets.java:2570
+msgid "Travel Agency"
+msgstr ""
+
+#. item "Shops/Travel Agency"
 #: build/trans_presets.java:2571
-msgid "Book Store"
-msgstr ""
-
-#. item "Shops/Book Store"
-#: build/trans_presets.java:2572
-msgid "Edit Book Store"
-msgstr ""
-
-#: build/trans_presets.java:2577
-msgid "Travel Agency"
-msgstr ""
-
-#. item "Shops/Travel Agency"
+msgid "Edit Travel Agency"
+msgstr ""
+
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "kasap"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
 #: build/trans_presets.java:2578
-msgid "Edit Travel Agency"
-msgstr ""
+msgid "Edit Butcher"
+msgstr "kasap düzenle"
 
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "fırın"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "fırın düzenle"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr ""
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr ""
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr ""
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr ""
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr ""
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr ""
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr ""
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr ""
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr ""
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr ""
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr ""
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr ""
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr ""
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr ""
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr ""
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr ""
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr ""
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr ""
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "kendin-al-market"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "kendin-al-market düzenle"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr ""
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr ""
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "berber"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "berber düzenle"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr ""
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr ""
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr ""
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr ""
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr ""
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr ""
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "Kuru Temizleme"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "Kuru Temizleme Düzenle"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "Çamaşırhane"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "Çamaşırhane Düzenle"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "Dışortam"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "Dış ortam dükkanları düzenle"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr ""
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr ""
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr ""
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "Kahve Makinası"
@@ -26226,5 +26376,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "Kahve Makinası Düzenle"
@@ -26232,306 +26382,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "Ücretli Ürünler"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr "toplu_taşıma_bileti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr "toplu_taşıma_hatları"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr "Park_bileti"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "yiyecek"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "içecek"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "tatlı"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "sigara"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "fotoğraf"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "hayvan_besini"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "gazeteler"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "oyuncuklar"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "pullar"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-kart"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr "telefon_kartı"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr "bilet"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "bisiklet"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "kondom"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr "tampon"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr "dışkı_poşeti"
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr "hesap veya üyelik kartı"
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "kasap"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "kasap düzenle"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "fırın"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "fırın düzenle"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr ""
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr ""
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr ""
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr ""
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr ""
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr ""
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr ""
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr ""
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr ""
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr ""
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr ""
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr ""
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr ""
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr ""
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr ""
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr ""
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr ""
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr ""
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "kendin-al-market"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "kendin-al-market düzenle"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr ""
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr ""
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "berber"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "berber düzenle"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr ""
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr ""
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr ""
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr ""
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr ""
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr ""
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "Kuru Temizleme"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "Kuru Temizleme Düzenle"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "Çamaşırhane"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "Çamaşırhane Düzenle"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "Dışortam"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "Dış ortam dükkanları düzenle"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr ""
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr ""
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr ""
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "Kasa"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "Banka"
@@ -26539,14 +26481,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "Banka düzenle"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "ATM"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr "Döviz Bürosu"
@@ -26554,5 +26496,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr "Döviz Bürosu Düzenle"
@@ -26560,15 +26502,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "ATM Düzenle"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "Sağlık"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "Doktor"
@@ -26576,18 +26518,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "Doktor Düzenle"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "Dişçi"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "Dişçi Düzenle"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "Eczane"
@@ -26595,5 +26537,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "Eczane Düzenle"
@@ -26601,9 +26543,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "Dispenser"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "Hastane"
@@ -26611,10 +26553,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "Hastane Düzenle"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr "Acil Durum Noktası"
@@ -26623,5 +26565,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr "Acil Durum Noktası Düzenle"
@@ -26630,20 +26572,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr "Nokta Numarası"
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "Telefon Numarası"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(Uluslararası kod kullanın, ör +90-212-67890)"
@@ -26651,5 +26593,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "Veteriner"
@@ -26658,64 +26600,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "Veteriner Düzenle"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr ""
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "Yerler"
 
 #. group "Geography/Places"
-#: build/trans_presets.java:2825
+#: build/trans_presets.java:2818
 msgid "Continent"
 msgstr "Kıta"
 
 #. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
+#: build/trans_presets.java:2819
 msgid "Edit Continent"
 msgstr "Kıta Düzenle"
 
 #. item "Geography/Places/Continent" text "Name"
-#: build/trans_presets.java:2831
+#: build/trans_presets.java:2824
 msgid "Country"
 msgstr "Ülke"
 
 #. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
+#: build/trans_presets.java:2825
 msgid "Edit Country"
 msgstr "Ülke Düzenle"
 
 #. item "Geography/Places/Country" text "Name"
-#: build/trans_presets.java:2837
+#: build/trans_presets.java:2830
 msgid "State"
 msgstr "İl"
 
 #. item "Geography/Places/State"
-#: build/trans_presets.java:2838
+#: build/trans_presets.java:2831
 msgid "Edit State"
 msgstr "İl Düzenle"
 
 #. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
+#: build/trans_presets.java:2836
 msgid "Region"
 msgstr "Bölge"
 
 #. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
+#: build/trans_presets.java:2837
 msgid "Edit Region"
 msgstr "Bölge Düzenle"
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "vilayet"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "vilayet Düzenle"
@@ -26723,15 +26665,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "Şehir"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "Şehir Düzenle"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "Mahalle"
@@ -26739,10 +26681,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "Mahalle Düzenle"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "Banliyo"
@@ -26750,25 +26692,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "Banliyo Düzenle"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "Köy"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "Köy Düzenle"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr "Mezra"
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr "Mezra Düzenle"
@@ -26776,5 +26718,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr "Semt"
@@ -26782,10 +26724,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr "Semt Düzenle"
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "Ada"
@@ -26793,10 +26735,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "Ada Düzenle"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26804,5 +26746,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26810,5 +26752,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "Mağara Girişi"
@@ -26816,10 +26758,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "Mağara Girişi Düzenle"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "Zirve"
@@ -26827,10 +26769,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "Zirve Düzenle"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "Buzul"
@@ -26838,10 +26780,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "Buzul Düzenle"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "Volkan"
@@ -26849,70 +26791,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "Volkan Düzenle"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "Belediye Sınırı"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "Milli"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "Ülke Sınırı Düzenle"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "İdari"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "İdari Sınırları Düzenle"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "Sivil"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "Sivil Sınırları Düzenle"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr ""
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "Politik Sınır Düzenle"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr ""
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "Milli Park Sınırı Düzenle"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "Arazi Kullanımı"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "Ağaç"
@@ -26921,15 +26863,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "Ağaç Düzenle"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "Botannik İsim"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr "Orman"
@@ -26938,5 +26880,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr "Orman Düzenle"
@@ -26944,17 +26886,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "Kozalaklı Orman"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "yaprak düken orman"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "karışık"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "orman"
@@ -26963,14 +26905,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "orman kullanımı düzenle"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "korunacak doğa alanı"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "korunacak doğa alanı düzenle"
@@ -26978,25 +26920,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr "Taşlık Alan"
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr "Taşlık Alan Düzenle"
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr "Çalılık"
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr "Çalılık Düzenle"
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr "Dağ Eteği"
@@ -27004,10 +26946,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr "Dağ Eteği Kullanımı"
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr "Sağlıksız Ağaç"
@@ -27015,5 +26957,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr "Sağlıksız Ağaç Düzenle"
@@ -27021,5 +26963,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr "Çiftlik"
@@ -27028,45 +26970,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr "Çiftlik Kullanımı Düzenle"
 
 #. item "Land use/Farmyard" text "Name"
-#: build/trans_presets.java:3036
+#: build/trans_presets.java:3029
 msgid "Farmland"
 msgstr "Çiftlik Arazisi"
 
 #. item "Land use/Farmland"
-#: build/trans_presets.java:3037
+#: build/trans_presets.java:3030
 msgid "Edit Farmland Landuse"
 msgstr "Çiftlik Arazisi Kullanımı Düzenle"
 
 #. item "Land use/Farmland" text "Name"
-#: build/trans_presets.java:3042
+#: build/trans_presets.java:3035
 msgid "Meadow"
 msgstr ""
 
 #. item "Land use/Meadow"
-#: build/trans_presets.java:3043
+#: build/trans_presets.java:3036
 msgid "Edit Meadow Landuse"
 msgstr ""
 
 #. item "Land use/Meadow" text "Name"
-#: build/trans_presets.java:3048
+#: build/trans_presets.java:3041
 msgid "Vineyard"
 msgstr "Bağ"
 
 #. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
+#: build/trans_presets.java:3042
 msgid "Edit Vineyard Landuse"
 msgstr "Bağ Kullanımı Düzenle"
 
 #. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
+#: build/trans_presets.java:3047
 msgid "Allotments"
 msgstr "Kiralık Tarım Alanı"
 
 #. item "Land use/Allotments"
-#: build/trans_presets.java:3055
+#: build/trans_presets.java:3048
 msgid "Edit Allotments Landuse"
 msgstr "Kiralık Tarım Alanı Düzenle"
@@ -27074,25 +27016,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "Bahçe"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "Bahçe Düzenle"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "Otlak"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr "Otlak Kullanım Düzenle"
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr "Köy Yerleşimi"
@@ -27100,10 +27042,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr "Köy Yerleşimi Düzenle"
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr "Genel"
@@ -27111,20 +27053,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr "Genel Düzenle"
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "Park"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "Park Düzenle"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr "oyun alanı"
@@ -27132,5 +27074,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr "oyun alanı kullanımı düzenle"
@@ -27138,15 +27080,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr "Yerleşim Alanı"
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr "Yerleşim Alanı Kullanımı Düzenle"
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr "Mezarlık"
@@ -27154,9 +27096,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr "Mezarlık Düzenle"
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr "Mezarlık"
@@ -27164,39 +27106,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
-#: build/trans_presets.java:3114
+#: build/trans_presets.java:3107
 msgid "Edit Cemetery Landuse"
 msgstr "Mezarlık Kullanımı Düzenle"
 
-#: build/trans_presets.java:3121
+#: build/trans_presets.java:3114
 msgid "Retail"
 msgstr "Perakende"
 
 #. item "Land use/Retail"
-#: build/trans_presets.java:3122
+#: build/trans_presets.java:3115
 msgid "Edit Retail Landuse"
 msgstr "Perakende Alan Kullanımı Düzenle"
 
 #. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
+#: build/trans_presets.java:3120
 msgid "Commercial"
 msgstr "Ticari"
 
 #. item "Land use/Commercial"
-#: build/trans_presets.java:3128
+#: build/trans_presets.java:3121
 msgid "Edit Commercial Landuse"
 msgstr "Ticari Alan Kullanımı Düzenle"
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "Endüstriyel"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr "Endüstriyel Alan Kullanımı Düzenle"
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr "Demiryolu alanı"
@@ -27204,15 +27146,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr "Demiryolu alanı kullanımı düzenle"
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr "Askeri"
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr "Askeri Alan Düzenle"
@@ -27220,50 +27162,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3153
+#: build/trans_presets.java:3146
 msgid "Construction area"
 msgstr "İnşaat Alanı"
 
 #. item "Land use/Construction area"
-#: build/trans_presets.java:3154
+#: build/trans_presets.java:3147
 msgid "Edit Construction Landuse"
 msgstr "İnşaat Alanı Düzenle"
 
 #. item "Land use/Construction area" text "Name"
-#: build/trans_presets.java:3159
+#: build/trans_presets.java:3152
 msgid "Brownfield"
 msgstr "Ağaçsız_Alan"
 
 #. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
+#: build/trans_presets.java:3153
 msgid "Edit Brownfield Landuse"
 msgstr "Ağaçsız_Alan Kullanımı Düzenle"
 
 #. item "Land use/Brownfield" text "Name"
-#: build/trans_presets.java:3165
+#: build/trans_presets.java:3158
 msgid "Greenfield"
 msgstr "Yeşil Alan"
 
 #. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
+#: build/trans_presets.java:3159
 msgid "Edit Greenfield Landuse"
 msgstr "yeşil Alan kullanımı düzenle"
 
 #. item "Land use/Greenfield" text "Name"
-#: build/trans_presets.java:3171
+#: build/trans_presets.java:3164
 msgid "Landfill"
 msgstr "Toprak Dolum"
 
 #. item "Land use/Landfill"
-#: build/trans_presets.java:3172
+#: build/trans_presets.java:3165
 msgid "Edit Landfill Landuse"
 msgstr "Toprak Dolum Alanı Düzenle"
 
 #. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
+#: build/trans_presets.java:3170
 msgid "Quarry"
 msgstr "Taşocağı"
 
 #. item "Land use/Quarry"
-#: build/trans_presets.java:3178
+#: build/trans_presets.java:3171
 msgid "Edit Quarry Landuse"
 msgstr "taşocağı Düzenle"
@@ -27273,5 +27215,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27280,10 +27222,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27291,5 +27233,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27298,5 +27240,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27304,34 +27246,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27340,15 +27282,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27356,5 +27298,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27363,5 +27305,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27369,5 +27311,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27458,5 +27400,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27466,17 +27408,17 @@
 msgstr "bisiklet"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "otobüs"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27536,5 +27478,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27543,9 +27485,9 @@
 msgstr "ayak"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27559,10 +27501,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr "metro"
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27570,31 +27512,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr ""
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27603,32 +27545,107 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
 msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
+msgstr "standard"
 
 #. mappaint style named "standard"
Index: /applications/editors/josm/i18n/po/zh_TW.po
===================================================================
--- /applications/editors/josm/i18n/po/zh_TW.po	(revision 20944)
+++ /applications/editors/josm/i18n/po/zh_TW.po	(revision 20945)
@@ -8,6 +8,6 @@
 "Project-Id-Version: josm\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-14 19:25+0200\n"
-"PO-Revision-Date: 2010-04-06 21:08+0000\n"
+"POT-Creation-Date: 2010-04-20 18:19+0200\n"
+"PO-Revision-Date: 2010-04-14 20:32+0000\n"
 "Last-Translator: Chao-Hsiung Liao <j_h_liau@yahoo.com.tw>\n"
 "Language-Team: Traditional Chinese\n"
@@ -16,5 +16,5 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2010-04-14 16:46+0000\n"
+"X-Launchpad-Export-Date: 2010-04-20 15:51+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 "Language: zh_TW\n"
@@ -67,5 +67,5 @@
 #: ../core/src/org/openstreetmap/josm/actions/UploadSelectionAction.java:127
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:357
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:252
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:250
 #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:357
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
@@ -1184,5 +1184,5 @@
 
 #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:109
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:251
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:249
 msgid "Cannot move objects outside of the world."
 msgstr "不能將物件移動到世界外頭"
@@ -1496,5 +1496,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1106
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1351
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:29
 #: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java:44
@@ -2240,9 +2240,9 @@
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:98
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java:93
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:47
 #: ../plugins/buildings_tools/src/buildings_tools/DrawBuildingAction.java:82
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
 #: ../plugins/routes/src/org/openstreetmap/josm/plugins/routes/RelationEditMode.java:29
 #, java-format
@@ -2324,26 +2324,26 @@
 msgstr "結束繪製。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:102
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:88
 msgid "Extrude"
 msgstr "推出"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:101
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:87
 msgid "Create areas"
 msgstr "建立區域"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:398
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:388
 msgid "Extrude Way"
 msgstr "推出路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:418
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:408
 msgid "Move a segment along its normal, then release the mouse button."
 msgstr "以平常的方式移動一個區段，然後放開滑鼠按鈕。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:420
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:410
 msgid "Draw a rectangle of the desired size, then release the mouse button."
 msgstr "繪出想要尺寸的矩形，然後放開滑鼠按鈕。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:422
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java:412
 msgid ""
 "Drag a way segment to make a rectangle. Ctrl-drag to move a segment along "
@@ -2362,6 +2362,6 @@
 "將播放開頭拖曳並放至要播放音效的軌跡旁；按 SHIFT+釋放就會從那一點同步化音效。"
 
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 #: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
@@ -2373,9 +2373,9 @@
 msgstr "選擇"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:111
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:110
 msgid "Select, move and rotate objects"
 msgstr "選擇、移動和旋轉物件"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:212
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:211
 #, java-format
 msgid "Add and move a virtual new node to way"
@@ -2383,17 +2383,17 @@
 msgstr[0] "加入並移動虛擬新節點至{0}路徑"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:469
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:467
 msgid "Move elements"
 msgstr "移動元素"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Move them"
 msgstr "移動它們"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:468
 msgid "Undo move"
 msgstr "取消移動"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:472
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:470
 #, java-format
 msgid ""
@@ -2405,18 +2405,18 @@
 "真的要移動它們嗎？"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:542
 msgid "Release the mouse button to select the objects in the rectangle."
 msgstr "放開滑鼠按鈕以選擇矩形內的物件。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:544
 msgid ""
 "Release the mouse button to stop moving. Ctrl to merge with nearest node."
 msgstr "放開滑鼠按鈕以停止移動。按 Ctrl 則會與最近的節點合併。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:546
 msgid "Release the mouse button to stop rotating."
 msgstr "放開滑鼠按鈕以停止旋轉。"
 
-#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:550
+#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:548
 msgid ""
 "Move objects by dragging; Shift to add to selection (Ctrl to toggle); Shift-"
@@ -3150,5 +3150,5 @@
 msgstr "是否接受？"
 
-#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:185
+#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:190
 msgid ""
 "When reversing this way, the following changes to properties of the way and "
@@ -3725,12 +3725,10 @@
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:16
-#, fuzzy
 msgid "Node: connection"
-msgstr "未連線"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:17
-#, fuzzy
 msgid "Node: tagged"
-msgstr "尚未加上標籤的圖片"
+msgstr ""
 
 #. teal
@@ -3911,5 +3909,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:138
 #: ../core/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java:340
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "railway"
 msgstr "鐵路"
@@ -5197,5 +5195,5 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java:172
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "all"
 msgstr "全部"
@@ -5622,4 +5620,9 @@
 msgstr "過濾條件模式"
 
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:218
+#, java-format
+msgid "Filter Hidden: {0} Disabled: {0}"
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:69
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:70
@@ -5710,5 +5713,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:91
 #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:767
-#: build/trans_presets.java:3186
+#: build/trans_presets.java:3179
 msgid "Relations"
 msgstr "關係"
@@ -5810,14 +5813,14 @@
 msgstr "選擇區域：{0}"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:375
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:374
 msgid "Undock the panel"
 msgstr "解鎖面板"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:389
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:388
 msgid ""
 "Close this panel. You can reopen it with the buttons in the left toolbar."
 msgstr "關閉這個面板。您可以用左側工具列的按鈕重新開啟它。"
 
-#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:401
+#: ../core/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java:399
 msgid "Click to minimize/maximize the panel content"
 msgstr "點選以最小化/最大化面板內容"
@@ -6147,4 +6150,10 @@
 #. <key key="highway" value="road" />
 #. <optional>
+#. item "Highways/Streets/Construction" label "Edit Highway Under Construction"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
+#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
+#. <space />
+#. <key key="highway" value="construction" />
+#. <optional>
 #. item "Highways/Streets/Bridge" label "Edit Bridge"
 #. <space />
@@ -6157,10 +6166,4 @@
 #. <space />
 #. <key key="tunnel" value="yes" />
-#. <optional>
-#. item "Ways/Construction" label "Edit Highway Under Construction"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=construction"
-#. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=construction" />
-#. <space />
-#. <key key="highway" value="construction" />
 #. <optional>
 #. item "Ways/Track" label "Edit Track"
@@ -6830,145 +6833,145 @@
 #: build/trans_presets.java:247 build/trans_presets.java:265
 #: build/trans_presets.java:283 build/trans_presets.java:303
-#: build/trans_presets.java:337 build/trans_presets.java:385
-#: build/trans_presets.java:405 build/trans_presets.java:420
-#: build/trans_presets.java:435 build/trans_presets.java:455
-#: build/trans_presets.java:479 build/trans_presets.java:508
-#: build/trans_presets.java:528 build/trans_presets.java:551
-#: build/trans_presets.java:573 build/trans_presets.java:592
-#: build/trans_presets.java:615 build/trans_presets.java:634
-#: build/trans_presets.java:643 build/trans_presets.java:701
-#: build/trans_presets.java:727 build/trans_presets.java:736
-#: build/trans_presets.java:796 build/trans_presets.java:947
-#: build/trans_presets.java:955 build/trans_presets.java:963
-#: build/trans_presets.java:971 build/trans_presets.java:979
-#: build/trans_presets.java:989 build/trans_presets.java:997
-#: build/trans_presets.java:1002 build/trans_presets.java:1009
-#: build/trans_presets.java:1016 build/trans_presets.java:1021
-#: build/trans_presets.java:1029 build/trans_presets.java:1038
-#: build/trans_presets.java:1044 build/trans_presets.java:1050
-#: build/trans_presets.java:1055 build/trans_presets.java:1061
-#: build/trans_presets.java:1067 build/trans_presets.java:1076
-#: build/trans_presets.java:1085 build/trans_presets.java:1092
-#: build/trans_presets.java:1100 build/trans_presets.java:1113
-#: build/trans_presets.java:1119 build/trans_presets.java:1128
-#: build/trans_presets.java:1134 build/trans_presets.java:1140
-#: build/trans_presets.java:1148 build/trans_presets.java:1245
-#: build/trans_presets.java:1296 build/trans_presets.java:1302
-#: build/trans_presets.java:1308 build/trans_presets.java:1314
-#: build/trans_presets.java:1320 build/trans_presets.java:1326
-#: build/trans_presets.java:1339 build/trans_presets.java:1363
-#: build/trans_presets.java:1378 build/trans_presets.java:1384
-#: build/trans_presets.java:1392 build/trans_presets.java:1399
-#: build/trans_presets.java:1408 build/trans_presets.java:1416
-#: build/trans_presets.java:1427 build/trans_presets.java:1437
-#: build/trans_presets.java:1447 build/trans_presets.java:1467
-#: build/trans_presets.java:1479 build/trans_presets.java:1490
-#: build/trans_presets.java:1510 build/trans_presets.java:1519
-#: build/trans_presets.java:1575 build/trans_presets.java:1592
-#: build/trans_presets.java:1599 build/trans_presets.java:1604
-#: build/trans_presets.java:1610 build/trans_presets.java:1616
-#: build/trans_presets.java:1621 build/trans_presets.java:1627
-#: build/trans_presets.java:1633 build/trans_presets.java:1641
-#: build/trans_presets.java:1649 build/trans_presets.java:1657
-#: build/trans_presets.java:1664 build/trans_presets.java:1670
-#: build/trans_presets.java:1677 build/trans_presets.java:1684
-#: build/trans_presets.java:1692 build/trans_presets.java:1699
-#: build/trans_presets.java:1707 build/trans_presets.java:1714
-#: build/trans_presets.java:1720 build/trans_presets.java:1727
-#: build/trans_presets.java:1734 build/trans_presets.java:1741
-#: build/trans_presets.java:1758 build/trans_presets.java:1766
-#: build/trans_presets.java:1781 build/trans_presets.java:1791
-#: build/trans_presets.java:1803 build/trans_presets.java:1810
-#: build/trans_presets.java:1816 build/trans_presets.java:1826
-#: build/trans_presets.java:1831 build/trans_presets.java:1839
-#: build/trans_presets.java:1846 build/trans_presets.java:1852
-#: build/trans_presets.java:1858 build/trans_presets.java:1864
-#: build/trans_presets.java:1869 build/trans_presets.java:1874
-#: build/trans_presets.java:1879 build/trans_presets.java:1886
-#: build/trans_presets.java:1892 build/trans_presets.java:1897
-#: build/trans_presets.java:1906 build/trans_presets.java:1915
-#: build/trans_presets.java:1924 build/trans_presets.java:1933
-#: build/trans_presets.java:1942 build/trans_presets.java:1948
-#: build/trans_presets.java:1956 build/trans_presets.java:1962
-#: build/trans_presets.java:1968 build/trans_presets.java:1974
-#: build/trans_presets.java:1980 build/trans_presets.java:1986
-#: build/trans_presets.java:1992 build/trans_presets.java:1998
-#: build/trans_presets.java:2004 build/trans_presets.java:2010
-#: build/trans_presets.java:2016 build/trans_presets.java:2022
-#: build/trans_presets.java:2028 build/trans_presets.java:2034
-#: build/trans_presets.java:2040 build/trans_presets.java:2047
-#: build/trans_presets.java:2056 build/trans_presets.java:2064
-#: build/trans_presets.java:2070 build/trans_presets.java:2076
-#: build/trans_presets.java:2082 build/trans_presets.java:2088
-#: build/trans_presets.java:2094 build/trans_presets.java:2100
-#: build/trans_presets.java:2106 build/trans_presets.java:2112
-#: build/trans_presets.java:2118 build/trans_presets.java:2124
-#: build/trans_presets.java:2130 build/trans_presets.java:2136
-#: build/trans_presets.java:2142 build/trans_presets.java:2148
-#: build/trans_presets.java:2154 build/trans_presets.java:2160
-#: build/trans_presets.java:2174 build/trans_presets.java:2180
-#: build/trans_presets.java:2186 build/trans_presets.java:2193
-#: build/trans_presets.java:2200 build/trans_presets.java:2208
-#: build/trans_presets.java:2215 build/trans_presets.java:2221
-#: build/trans_presets.java:2228 build/trans_presets.java:2234
-#: build/trans_presets.java:2240 build/trans_presets.java:2246
-#: build/trans_presets.java:2254 build/trans_presets.java:2261
-#: build/trans_presets.java:2268 build/trans_presets.java:2275
-#: build/trans_presets.java:2283 build/trans_presets.java:2315
-#: build/trans_presets.java:2320 build/trans_presets.java:2330
-#: build/trans_presets.java:2335 build/trans_presets.java:2341
-#: build/trans_presets.java:2347 build/trans_presets.java:2364
-#: build/trans_presets.java:2370 build/trans_presets.java:2376
-#: build/trans_presets.java:2382 build/trans_presets.java:2388
-#: build/trans_presets.java:2399 build/trans_presets.java:2406
-#: build/trans_presets.java:2507 build/trans_presets.java:2514
-#: build/trans_presets.java:2535 build/trans_presets.java:2543
-#: build/trans_presets.java:2548 build/trans_presets.java:2554
-#: build/trans_presets.java:2561 build/trans_presets.java:2568
-#: build/trans_presets.java:2574 build/trans_presets.java:2580
-#: build/trans_presets.java:2602 build/trans_presets.java:2609
-#: build/trans_presets.java:2616 build/trans_presets.java:2622
-#: build/trans_presets.java:2629 build/trans_presets.java:2635
-#: build/trans_presets.java:2641 build/trans_presets.java:2647
-#: build/trans_presets.java:2653 build/trans_presets.java:2659
-#: build/trans_presets.java:2666 build/trans_presets.java:2673
-#: build/trans_presets.java:2680 build/trans_presets.java:2686
-#: build/trans_presets.java:2692 build/trans_presets.java:2698
-#: build/trans_presets.java:2704 build/trans_presets.java:2710
-#: build/trans_presets.java:2717 build/trans_presets.java:2724
-#: build/trans_presets.java:2731 build/trans_presets.java:2737
-#: build/trans_presets.java:2743 build/trans_presets.java:2753
-#: build/trans_presets.java:2762 build/trans_presets.java:2777
-#: build/trans_presets.java:2783 build/trans_presets.java:2791
-#: build/trans_presets.java:2798 build/trans_presets.java:2818
-#: build/trans_presets.java:2829 build/trans_presets.java:2835
-#: build/trans_presets.java:2841 build/trans_presets.java:2847
-#: build/trans_presets.java:2853 build/trans_presets.java:2860
-#: build/trans_presets.java:2867 build/trans_presets.java:2874
-#: build/trans_presets.java:2880 build/trans_presets.java:2886
-#: build/trans_presets.java:2894 build/trans_presets.java:2901
-#: build/trans_presets.java:2908 build/trans_presets.java:2915
-#: build/trans_presets.java:2921 build/trans_presets.java:2928
-#: build/trans_presets.java:2935 build/trans_presets.java:2944
-#: build/trans_presets.java:2950 build/trans_presets.java:2956
-#: build/trans_presets.java:2962 build/trans_presets.java:2968
-#: build/trans_presets.java:2977 build/trans_presets.java:2987
-#: build/trans_presets.java:2996 build/trans_presets.java:3002
-#: build/trans_presets.java:3008 build/trans_presets.java:3013
-#: build/trans_presets.java:3019 build/trans_presets.java:3025
-#: build/trans_presets.java:3034 build/trans_presets.java:3040
-#: build/trans_presets.java:3046 build/trans_presets.java:3052
-#: build/trans_presets.java:3058 build/trans_presets.java:3064
-#: build/trans_presets.java:3070 build/trans_presets.java:3077
-#: build/trans_presets.java:3083 build/trans_presets.java:3088
-#: build/trans_presets.java:3095 build/trans_presets.java:3102
-#: build/trans_presets.java:3108 build/trans_presets.java:3117
-#: build/trans_presets.java:3125 build/trans_presets.java:3131
-#: build/trans_presets.java:3137 build/trans_presets.java:3144
-#: build/trans_presets.java:3150 build/trans_presets.java:3157
-#: build/trans_presets.java:3163 build/trans_presets.java:3169
-#: build/trans_presets.java:3175 build/trans_presets.java:3181
-#: build/trans_presets.java:3194 build/trans_presets.java:3208
-#: build/trans_presets.java:3222
+#: build/trans_presets.java:336 build/trans_presets.java:355
+#: build/trans_presets.java:404 build/trans_presets.java:424
+#: build/trans_presets.java:439 build/trans_presets.java:454
+#: build/trans_presets.java:477 build/trans_presets.java:506
+#: build/trans_presets.java:526 build/trans_presets.java:549
+#: build/trans_presets.java:571 build/trans_presets.java:590
+#: build/trans_presets.java:609 build/trans_presets.java:627
+#: build/trans_presets.java:636 build/trans_presets.java:694
+#: build/trans_presets.java:720 build/trans_presets.java:729
+#: build/trans_presets.java:789 build/trans_presets.java:940
+#: build/trans_presets.java:948 build/trans_presets.java:956
+#: build/trans_presets.java:964 build/trans_presets.java:972
+#: build/trans_presets.java:982 build/trans_presets.java:990
+#: build/trans_presets.java:995 build/trans_presets.java:1002
+#: build/trans_presets.java:1009 build/trans_presets.java:1014
+#: build/trans_presets.java:1022 build/trans_presets.java:1031
+#: build/trans_presets.java:1037 build/trans_presets.java:1043
+#: build/trans_presets.java:1048 build/trans_presets.java:1054
+#: build/trans_presets.java:1060 build/trans_presets.java:1069
+#: build/trans_presets.java:1078 build/trans_presets.java:1085
+#: build/trans_presets.java:1093 build/trans_presets.java:1106
+#: build/trans_presets.java:1112 build/trans_presets.java:1121
+#: build/trans_presets.java:1127 build/trans_presets.java:1133
+#: build/trans_presets.java:1141 build/trans_presets.java:1238
+#: build/trans_presets.java:1289 build/trans_presets.java:1295
+#: build/trans_presets.java:1301 build/trans_presets.java:1307
+#: build/trans_presets.java:1313 build/trans_presets.java:1319
+#: build/trans_presets.java:1332 build/trans_presets.java:1356
+#: build/trans_presets.java:1371 build/trans_presets.java:1377
+#: build/trans_presets.java:1385 build/trans_presets.java:1392
+#: build/trans_presets.java:1401 build/trans_presets.java:1409
+#: build/trans_presets.java:1420 build/trans_presets.java:1430
+#: build/trans_presets.java:1440 build/trans_presets.java:1460
+#: build/trans_presets.java:1472 build/trans_presets.java:1483
+#: build/trans_presets.java:1503 build/trans_presets.java:1512
+#: build/trans_presets.java:1568 build/trans_presets.java:1585
+#: build/trans_presets.java:1592 build/trans_presets.java:1597
+#: build/trans_presets.java:1603 build/trans_presets.java:1609
+#: build/trans_presets.java:1614 build/trans_presets.java:1620
+#: build/trans_presets.java:1626 build/trans_presets.java:1634
+#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1657 build/trans_presets.java:1663
+#: build/trans_presets.java:1670 build/trans_presets.java:1677
+#: build/trans_presets.java:1685 build/trans_presets.java:1692
+#: build/trans_presets.java:1700 build/trans_presets.java:1707
+#: build/trans_presets.java:1713 build/trans_presets.java:1720
+#: build/trans_presets.java:1727 build/trans_presets.java:1734
+#: build/trans_presets.java:1751 build/trans_presets.java:1759
+#: build/trans_presets.java:1774 build/trans_presets.java:1784
+#: build/trans_presets.java:1796 build/trans_presets.java:1803
+#: build/trans_presets.java:1809 build/trans_presets.java:1819
+#: build/trans_presets.java:1824 build/trans_presets.java:1832
+#: build/trans_presets.java:1839 build/trans_presets.java:1845
+#: build/trans_presets.java:1851 build/trans_presets.java:1857
+#: build/trans_presets.java:1862 build/trans_presets.java:1867
+#: build/trans_presets.java:1872 build/trans_presets.java:1879
+#: build/trans_presets.java:1885 build/trans_presets.java:1890
+#: build/trans_presets.java:1899 build/trans_presets.java:1908
+#: build/trans_presets.java:1917 build/trans_presets.java:1926
+#: build/trans_presets.java:1935 build/trans_presets.java:1941
+#: build/trans_presets.java:1949 build/trans_presets.java:1955
+#: build/trans_presets.java:1961 build/trans_presets.java:1967
+#: build/trans_presets.java:1973 build/trans_presets.java:1979
+#: build/trans_presets.java:1985 build/trans_presets.java:1991
+#: build/trans_presets.java:1997 build/trans_presets.java:2003
+#: build/trans_presets.java:2009 build/trans_presets.java:2015
+#: build/trans_presets.java:2021 build/trans_presets.java:2027
+#: build/trans_presets.java:2033 build/trans_presets.java:2040
+#: build/trans_presets.java:2049 build/trans_presets.java:2057
+#: build/trans_presets.java:2063 build/trans_presets.java:2069
+#: build/trans_presets.java:2075 build/trans_presets.java:2081
+#: build/trans_presets.java:2087 build/trans_presets.java:2093
+#: build/trans_presets.java:2099 build/trans_presets.java:2105
+#: build/trans_presets.java:2111 build/trans_presets.java:2117
+#: build/trans_presets.java:2123 build/trans_presets.java:2129
+#: build/trans_presets.java:2135 build/trans_presets.java:2141
+#: build/trans_presets.java:2147 build/trans_presets.java:2153
+#: build/trans_presets.java:2167 build/trans_presets.java:2173
+#: build/trans_presets.java:2179 build/trans_presets.java:2186
+#: build/trans_presets.java:2193 build/trans_presets.java:2201
+#: build/trans_presets.java:2208 build/trans_presets.java:2214
+#: build/trans_presets.java:2221 build/trans_presets.java:2227
+#: build/trans_presets.java:2233 build/trans_presets.java:2239
+#: build/trans_presets.java:2247 build/trans_presets.java:2254
+#: build/trans_presets.java:2261 build/trans_presets.java:2268
+#: build/trans_presets.java:2276 build/trans_presets.java:2308
+#: build/trans_presets.java:2313 build/trans_presets.java:2323
+#: build/trans_presets.java:2328 build/trans_presets.java:2334
+#: build/trans_presets.java:2340 build/trans_presets.java:2357
+#: build/trans_presets.java:2363 build/trans_presets.java:2369
+#: build/trans_presets.java:2375 build/trans_presets.java:2381
+#: build/trans_presets.java:2392 build/trans_presets.java:2399
+#: build/trans_presets.java:2500 build/trans_presets.java:2507
+#: build/trans_presets.java:2528 build/trans_presets.java:2536
+#: build/trans_presets.java:2541 build/trans_presets.java:2547
+#: build/trans_presets.java:2554 build/trans_presets.java:2561
+#: build/trans_presets.java:2567 build/trans_presets.java:2573
+#: build/trans_presets.java:2580 build/trans_presets.java:2587
+#: build/trans_presets.java:2594 build/trans_presets.java:2600
+#: build/trans_presets.java:2607 build/trans_presets.java:2613
+#: build/trans_presets.java:2619 build/trans_presets.java:2625
+#: build/trans_presets.java:2631 build/trans_presets.java:2637
+#: build/trans_presets.java:2644 build/trans_presets.java:2651
+#: build/trans_presets.java:2658 build/trans_presets.java:2664
+#: build/trans_presets.java:2670 build/trans_presets.java:2676
+#: build/trans_presets.java:2682 build/trans_presets.java:2688
+#: build/trans_presets.java:2695 build/trans_presets.java:2702
+#: build/trans_presets.java:2709 build/trans_presets.java:2715
+#: build/trans_presets.java:2721 build/trans_presets.java:2746
+#: build/trans_presets.java:2755 build/trans_presets.java:2770
+#: build/trans_presets.java:2776 build/trans_presets.java:2784
+#: build/trans_presets.java:2791 build/trans_presets.java:2811
+#: build/trans_presets.java:2822 build/trans_presets.java:2828
+#: build/trans_presets.java:2834 build/trans_presets.java:2840
+#: build/trans_presets.java:2846 build/trans_presets.java:2853
+#: build/trans_presets.java:2860 build/trans_presets.java:2867
+#: build/trans_presets.java:2873 build/trans_presets.java:2879
+#: build/trans_presets.java:2887 build/trans_presets.java:2894
+#: build/trans_presets.java:2901 build/trans_presets.java:2908
+#: build/trans_presets.java:2914 build/trans_presets.java:2921
+#: build/trans_presets.java:2928 build/trans_presets.java:2937
+#: build/trans_presets.java:2943 build/trans_presets.java:2949
+#: build/trans_presets.java:2955 build/trans_presets.java:2961
+#: build/trans_presets.java:2970 build/trans_presets.java:2980
+#: build/trans_presets.java:2989 build/trans_presets.java:2995
+#: build/trans_presets.java:3001 build/trans_presets.java:3006
+#: build/trans_presets.java:3012 build/trans_presets.java:3018
+#: build/trans_presets.java:3027 build/trans_presets.java:3033
+#: build/trans_presets.java:3039 build/trans_presets.java:3045
+#: build/trans_presets.java:3051 build/trans_presets.java:3057
+#: build/trans_presets.java:3063 build/trans_presets.java:3070
+#: build/trans_presets.java:3076 build/trans_presets.java:3081
+#: build/trans_presets.java:3088 build/trans_presets.java:3095
+#: build/trans_presets.java:3101 build/trans_presets.java:3110
+#: build/trans_presets.java:3118 build/trans_presets.java:3124
+#: build/trans_presets.java:3130 build/trans_presets.java:3137
+#: build/trans_presets.java:3143 build/trans_presets.java:3150
+#: build/trans_presets.java:3156 build/trans_presets.java:3162
+#: build/trans_presets.java:3168 build/trans_presets.java:3174
+#: build/trans_presets.java:3187 build/trans_presets.java:3201
+#: build/trans_presets.java:3215
 msgid "Name"
 msgstr "名稱"
@@ -8211,10 +8214,10 @@
 #. item "Land use/Forest" text "Name"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:433
-#: build/trans_presets.java:383 build/trans_presets.java:667
-#: build/trans_presets.java:676 build/trans_presets.java:1039
-#: build/trans_presets.java:1365 build/trans_presets.java:2355
-#: build/trans_presets.java:2389 build/trans_presets.java:2398
-#: build/trans_presets.java:2424 build/trans_presets.java:2978
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:402 build/trans_presets.java:660
+#: build/trans_presets.java:669 build/trans_presets.java:1032
+#: build/trans_presets.java:1358 build/trans_presets.java:2348
+#: build/trans_presets.java:2382 build/trans_presets.java:2391
+#: build/trans_presets.java:2417 build/trans_presets.java:2971
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "Type"
 msgstr "類型"
@@ -8222,5 +8225,4 @@
 #. item "Ways/Path" combo "Wheelchairs"
 #. item "Ways/Dedicated Cycleway" combo "Pedestrians"
-#. item "Ways/Dedicated Footway" combo "Bikes"
 #: ../core/src/org/openstreetmap/josm/gui/download/PlaceSelection.java:540
 #: ../core/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java:94
@@ -8234,17 +8236,16 @@
 #: ../plugins/livegps/src/livegps/LiveGpsDialog.java:86
 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/ac/AutoCompletionListRenderer.java:117
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:492
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:490
+#: build/trans_presets.java:533 build/trans_presets.java:645
+#: build/trans_presets.java:660 build/trans_presets.java:1269
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
 msgid "unknown"
 msgstr "不明"
@@ -9038,11 +9039,13 @@
 #. item "Highways/Streets/Service" check "Passing Places"
 #. item "Highways/Streets/Road (Unknown Type)" check "Embankment"
+#. item "Highways/Streets/Construction" check "Embankment"
 #. item "Highways/Streets/Roundabout" check "Embankment"
 #. item "Highways/Streets/Bridge" text "Name"
 #. item "Highways/Streets/Tunnel" text "Name"
-#. item "Ways/Construction" check "Embankment"
+#. item "Ways/Track" check "Oneway"
 #. item "Ways/Dedicated Bridleway" check "Embankment"
 #. item "Ways/Segregated Foot- and Cycleway" check "Embankment"
 #. item "Ways/Combined Foot- and Cycleway" check "Passing Places"
+#. item "Ways/Dedicated Footway" check "Passing Places"
 #. item "Ways/Steps" check "Embankment"
 #. item "Water/Water/Drain" text "Name"
@@ -9059,14 +9062,14 @@
 #: build/trans_presets.java:236 build/trans_presets.java:254
 #: build/trans_presets.java:272 build/trans_presets.java:290
-#: build/trans_presets.java:310 build/trans_presets.java:343
-#: build/trans_presets.java:391 build/trans_presets.java:406
-#: build/trans_presets.java:421 build/trans_presets.java:441
-#: build/trans_presets.java:465 build/trans_presets.java:496
-#: build/trans_presets.java:514 build/trans_presets.java:535
-#: build/trans_presets.java:557 build/trans_presets.java:580
-#: build/trans_presets.java:601 build/trans_presets.java:621
-#: build/trans_presets.java:956 build/trans_presets.java:964
-#: build/trans_presets.java:972 build/trans_presets.java:980
-#: build/trans_presets.java:990 build/trans_presets.java:1251
+#: build/trans_presets.java:310 build/trans_presets.java:342
+#: build/trans_presets.java:361 build/trans_presets.java:410
+#: build/trans_presets.java:425 build/trans_presets.java:440
+#: build/trans_presets.java:463 build/trans_presets.java:494
+#: build/trans_presets.java:513 build/trans_presets.java:534
+#: build/trans_presets.java:556 build/trans_presets.java:579
+#: build/trans_presets.java:597 build/trans_presets.java:616
+#: build/trans_presets.java:949 build/trans_presets.java:957
+#: build/trans_presets.java:965 build/trans_presets.java:973
+#: build/trans_presets.java:983 build/trans_presets.java:1244
 msgid "Layer"
 msgstr "層級"
@@ -9598,5 +9601,5 @@
 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:379
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:142
-#: build/trans_presets.java:3225
+#: build/trans_presets.java:3218
 msgid "Description"
 msgstr "描述"
@@ -10649,55 +10652,55 @@
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:100
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:103
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:106
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:101
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:104
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:107
 msgid "Warning: failed to cancel running OAuth operation"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:130
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:131
 #, java-format
 msgid "Retrieving OAuth Request Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:163
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:164
 #, java-format
 msgid "Retrieving OAuth Access Token from ''{0}''"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:300
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:298
 #, java-format
 msgid "OSM website did not return a session cookie in response to ''{0}'',"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:351
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:349
 #, java-format
 msgid "Failed to authenticate user ''{0}'' with password ''***'' as OAuth user"
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:438
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:436
 #, java-format
 msgid "Failed to authorize OAuth request  ''{0}''"
 msgstr ""
 
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:483
+#, java-format
+msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
+msgstr ""
+
 #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:485
-#, java-format
-msgid "Authorizing OAuth Request token ''{0}'' at the OSM website ..."
-msgstr ""
-
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:487
 msgid "Initializing a session at the OSM website..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:493
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:491
 #, java-format
 msgid "Authenticating the session for user ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:499
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:497
 #, java-format
 msgid "Authorizing request token ''{0}''..."
 msgstr ""
 
-#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:505
+#: ../core/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java:503
 #, java-format
 msgid "Logging out session ''{0}''..."
@@ -11170,5 +11173,5 @@
 #. <separator/>
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:1330
+#: build/trans_presets.java:1323
 msgid "Car"
 msgstr "汽車"
@@ -11190,16 +11193,17 @@
 #. item "Public Transport/Subway Entrance" check "Wheelchair"
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:359 build/trans_presets.java:490
-#: build/trans_presets.java:752 build/trans_presets.java:771
-#: build/trans_presets.java:785 build/trans_presets.java:807
-#: build/trans_presets.java:844 build/trans_presets.java:857
-#: build/trans_presets.java:869 build/trans_presets.java:881
-#: build/trans_presets.java:893 build/trans_presets.java:905
-#: build/trans_presets.java:915 build/trans_presets.java:924
-#: build/trans_presets.java:933 build/trans_presets.java:1403
-#: build/trans_presets.java:1469
+#: build/trans_presets.java:378 build/trans_presets.java:488
+#: build/trans_presets.java:745 build/trans_presets.java:764
+#: build/trans_presets.java:778 build/trans_presets.java:800
+#: build/trans_presets.java:837 build/trans_presets.java:850
+#: build/trans_presets.java:862 build/trans_presets.java:874
+#: build/trans_presets.java:886 build/trans_presets.java:898
+#: build/trans_presets.java:908 build/trans_presets.java:917
+#: build/trans_presets.java:926 build/trans_presets.java:1396
+#: build/trans_presets.java:1462
 msgid "Bicycle"
 msgstr "單車"
 
+#. item "Ways/Path" check "Oneway"
 #. item "Barriers/Bollard" label "Allowed traffic:"
 #. <space />
@@ -11229,12 +11233,12 @@
 #. <space />
 #: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:49
-#: build/trans_presets.java:360 build/trans_presets.java:489
-#: build/trans_presets.java:751 build/trans_presets.java:770
-#: build/trans_presets.java:784 build/trans_presets.java:806
-#: build/trans_presets.java:843 build/trans_presets.java:856
-#: build/trans_presets.java:868 build/trans_presets.java:880
-#: build/trans_presets.java:892 build/trans_presets.java:904
-#: build/trans_presets.java:914 build/trans_presets.java:923
-#: build/trans_presets.java:932
+#: build/trans_presets.java:379 build/trans_presets.java:487
+#: build/trans_presets.java:744 build/trans_presets.java:763
+#: build/trans_presets.java:777 build/trans_presets.java:799
+#: build/trans_presets.java:836 build/trans_presets.java:849
+#: build/trans_presets.java:861 build/trans_presets.java:873
+#: build/trans_presets.java:885 build/trans_presets.java:897
+#: build/trans_presets.java:907 build/trans_presets.java:916
+#: build/trans_presets.java:925
 msgid "Foot"
 msgstr "步行"
@@ -11930,12 +11934,10 @@
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:602
-#, fuzzy
 msgid "Parameter name"
-msgstr "街道名稱"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:603
-#, fuzzy
 msgid "Parameter value"
-msgstr "測量的數值"
+msgstr ""
 
 #: ../core/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java:608
@@ -14185,6 +14187,7 @@
 msgstr "上傳軌跡"
 
+#. item "Ways/Path" combo "MTB Scale"
 #: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:135
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "Visibility"
 msgstr "可見狀態"
@@ -14275,5 +14278,5 @@
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationAction.java:26
 #: ../plugins/addrinterpolation/src/org/openstreetmap/josm/plugins/AddrInterpolation/AddrInterpolationDialog.java:1196
-#: build/trans_presets.java:2303
+#: build/trans_presets.java:2296
 msgid "Address Interpolation"
 msgstr ""
@@ -14460,5 +14463,5 @@
 
 #: ../plugins/buildings_tools/src/buildings_tools/Building.java:163
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:209
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:221
 msgid "Create building"
 msgstr ""
@@ -14499,19 +14502,19 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:88
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:100
 msgid "Grab buildings"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:89
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:101
 msgid "Extract building on click (vector images only)"
 msgstr ""
 
 #. group "Man-Made"
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:90
-#: build/trans_presets.java:2166
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:102
+#: build/trans_presets.java:2159
 msgid "Buildings"
 msgstr "建築物"
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:107
+#: ../plugins/cadastre-fr/src/cadastre_fr/Buildings.java:119
 msgid ""
 "This feature requires (at least) one special cadastre\n"
@@ -14519,5 +14522,5 @@
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:99
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:100
 #, java-format
 msgid ""
@@ -14530,10 +14533,10 @@
 #. pane.createDialog(Main.parent, tr("Select Feuille")).setVisible(true);
 #. this below is a temporary workaround to fix the "always on top" issue
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:104
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:105
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreInterface.java:417
 msgid "Select Feuille"
 msgstr ""
 
-#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:148
+#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:155
 msgid ""
 "Error loading file.\n"
@@ -14575,7 +14578,6 @@
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CacheFileUTM20NFilter.java:22
-#, fuzzy
 msgid "Reunion RGR92 cache file (.UTM4)"
-msgstr "蘭勃特區 4 快取檔案 (.4)"
+msgstr ""
 
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastreGrabber.java:40
@@ -14720,5 +14722,5 @@
 #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:67
 #: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:23
-#: build/trans_presets.java:2355 build/trans_style.java:993
+#: build/trans_presets.java:2348 build/trans_style.java:993
 #: build/trans_style.java:1010 build/trans_style.java:1026
 #: build/trans_style.java:1033 build/trans_style.java:3492
@@ -16558,5 +16560,5 @@
 #. item "Bicycle/Rental" text "Name"
 #: ../plugins/public_transport/src/public_transport/PublicTransportPlugin.java:39
-#: build/trans_presets.java:1419
+#: build/trans_presets.java:1412
 msgid "Public Transport"
 msgstr "大眾運輸"
@@ -16608,5 +16610,5 @@
 #. </optional>
 #: ../plugins/public_transport/src/public_transport/StopImporterDialog.java:89
-#: build/trans_presets.java:628
+#: build/trans_presets.java:621
 msgid "Waypoints"
 msgstr "路標"
@@ -17178,4 +17180,22 @@
 msgstr ""
 
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:54
+#, fuzzy
+msgid "Type:"
+msgstr "類型"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:64
+#, fuzzy
+msgid "From:"
+msgstr "從..."
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:75
+msgid "To:"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/BasicEditorPanel.java:86
+msgid "Vias:"
+msgstr ""
+
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/JosmSelectionPanel.java:123
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionLegEditor.java:324
@@ -17332,4 +17352,17 @@
 #: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:633
 msgid "Already participating in a conflict"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:754
+#, fuzzy
+msgid "Delete this turn restriction"
+msgstr "刪除目前編輯的關係"
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:784
+msgid "Select this turn restriction"
+msgstr ""
+
+#: ../plugins/turnrestrictions/src/org/openstreetmap/josm/plugins/turnrestrictions/editor/TurnRestrictionEditor.java:810
+msgid "Activate the layer this turn restriction belongs to and zoom to it"
 msgstr ""
 
@@ -18085,5 +18118,5 @@
 #. group "Relations"
 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/MultipolygonTest.java:36
-#: build/trans_presets.java:3187
+#: build/trans_presets.java:3180
 msgid "Multipolygon"
 msgstr ""
@@ -19377,7 +19410,7 @@
 #: build/trans_presets.java:132 build/trans_presets.java:152
 #: build/trans_presets.java:189 build/trans_presets.java:209
-#: build/trans_presets.java:1531 build/trans_presets.java:1539
-#: build/trans_presets.java:1547 build/trans_presets.java:1581
-#: build/trans_presets.java:2408 build/trans_presets.java:3223
+#: build/trans_presets.java:1524 build/trans_presets.java:1532
+#: build/trans_presets.java:1540 build/trans_presets.java:1574
+#: build/trans_presets.java:2401 build/trans_presets.java:3216
 msgid "Reference"
 msgstr "道路編號"
@@ -19394,5 +19427,5 @@
 #: build/trans_presets.java:116 build/trans_presets.java:135
 #: build/trans_presets.java:156 build/trans_presets.java:172
-#: build/trans_presets.java:193 build/trans_presets.java:392
+#: build/trans_presets.java:193 build/trans_presets.java:411
 msgid "Lanes"
 msgstr "車道數"
@@ -19410,4 +19443,5 @@
 #. item "Highways/Streets/Tunnel" combo "Layer"
 #. item "Ways/Path" combo "Layer"
+#. item "Ways/Dedicated Bridleway" combo "Layer"
 #: build/trans_presets.java:81 build/trans_presets.java:98
 #: build/trans_presets.java:117 build/trans_presets.java:136
@@ -19415,9 +19449,8 @@
 #: build/trans_presets.java:194 build/trans_presets.java:213
 #: build/trans_presets.java:237 build/trans_presets.java:312
-#: build/trans_presets.java:345 build/trans_presets.java:367
-#: build/trans_presets.java:407 build/trans_presets.java:422
-#: build/trans_presets.java:444 build/trans_presets.java:497
-#: build/trans_presets.java:516 build/trans_presets.java:603
-#: build/trans_presets.java:623 build/trans_presets.java:1253
+#: build/trans_presets.java:344 build/trans_presets.java:364
+#: build/trans_presets.java:386 build/trans_presets.java:426
+#: build/trans_presets.java:441 build/trans_presets.java:495
+#: build/trans_presets.java:514 build/trans_presets.java:1246
 msgid "Max. speed (km/h)"
 msgstr "最高限速 (km/h)"
@@ -19445,15 +19478,9 @@
 #. <optional>
 #. item "Highways/Streets/Road (Unknown Type)" text "Name"
+#. item "Highways/Streets/Construction" text "Name"
 #. item "Highways/Streets/Road Restrictions" label "Edit Road Restrictions"
 #. item "Highways/Streets/Roundabout" text "Name"
-#. item "Ways/Construction" text "Name"
 #. item "Ways/Track" check "Embankment"
 #. item "Ways/Path" check "Embankment"
-#. item "Ways/Dedicated Bridleway" text "Name"
-#. item "Ways/Dedicated Cycleway" text "Name"
-#. item "Ways/Segregated Foot- and Cycleway" text "Name"
-#. item "Ways/Combined Foot- and Cycleway" text "Name"
-#. item "Ways/Dedicated Footway" text "Name"
-#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" text "Name"
 #: build/trans_presets.java:82 build/trans_presets.java:99
@@ -19464,11 +19491,10 @@
 #: build/trans_presets.java:267 build/trans_presets.java:285
 #: build/trans_presets.java:304 build/trans_presets.java:325
-#: build/trans_presets.java:338 build/trans_presets.java:354
-#: build/trans_presets.java:386 build/trans_presets.java:436
-#: build/trans_presets.java:460 build/trans_presets.java:484
-#: build/trans_presets.java:509 build/trans_presets.java:529
-#: build/trans_presets.java:552 build/trans_presets.java:574
-#: build/trans_presets.java:593 build/trans_presets.java:616
-#: build/trans_presets.java:1246
+#: build/trans_presets.java:337 build/trans_presets.java:356
+#: build/trans_presets.java:373 build/trans_presets.java:405
+#: build/trans_presets.java:462 build/trans_presets.java:486
+#: build/trans_presets.java:508 build/trans_presets.java:528
+#: build/trans_presets.java:551 build/trans_presets.java:573
+#: build/trans_presets.java:611 build/trans_presets.java:1239
 msgid "Oneway"
 msgstr "單行道"
@@ -19488,15 +19514,13 @@
 #. item "Highways/Streets/Service" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" check "Oneway"
+#. item "Highways/Streets/Construction" check "Oneway"
 #. item "Highways/Streets/Roundabout" check "Oneway"
 #. item "Highways/Streets/Roundabout" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Oneway"
-#. item "Ways/Track" text "Name"
-#. item "Ways/Path" text "Name"
+#. item "Ways/Track" combo "MTB Scale"
 #. item "Ways/Dedicated Bridleway" check "Oneway"
 #. item "Ways/Dedicated Cycleway" check "Oneway"
 #. item "Ways/Segregated Foot- and Cycleway" check "Oneway"
 #. item "Ways/Combined Foot- and Cycleway" check "Oneway"
-#. item "Ways/Dedicated Footway" check "Oneway"
 #. item "Ways/Steps" check "Oneway"
 #. item "Transport/Railway/Bus Guideway" check "Oneway"
@@ -19513,11 +19537,11 @@
 #: build/trans_presets.java:231 build/trans_presets.java:250
 #: build/trans_presets.java:268 build/trans_presets.java:286
-#: build/trans_presets.java:305 build/trans_presets.java:339
-#: build/trans_presets.java:387 build/trans_presets.java:396
-#: build/trans_presets.java:437 build/trans_presets.java:456
-#: build/trans_presets.java:480 build/trans_presets.java:510
-#: build/trans_presets.java:530 build/trans_presets.java:553
-#: build/trans_presets.java:575 build/trans_presets.java:594
-#: build/trans_presets.java:617 build/trans_presets.java:1247
+#: build/trans_presets.java:305 build/trans_presets.java:338
+#: build/trans_presets.java:357 build/trans_presets.java:406
+#: build/trans_presets.java:415 build/trans_presets.java:458
+#: build/trans_presets.java:482 build/trans_presets.java:509
+#: build/trans_presets.java:529 build/trans_presets.java:552
+#: build/trans_presets.java:574 build/trans_presets.java:592
+#: build/trans_presets.java:612 build/trans_presets.java:1240
 #: build/trans_surveyor.java:12
 msgid "Bridge"
@@ -19538,8 +19562,8 @@
 #. item "Highways/Streets/Service" check "Bridge"
 #. item "Highways/Streets/Road (Unknown Type)" check "Bridge"
+#. item "Highways/Streets/Construction" check "Bridge"
 #. item "Highways/Streets/Roundabout" check "Bridge"
 #. item "Highways/Streets/Bridge" text "Width (meters)"
 #. </optional>
-#. item "Ways/Construction" check "Bridge"
 #. item "Ways/Track" check "Bridge"
 #. item "Ways/Path" check "Bridge"
@@ -19557,11 +19581,11 @@
 #: build/trans_presets.java:232 build/trans_presets.java:251
 #: build/trans_presets.java:269 build/trans_presets.java:287
-#: build/trans_presets.java:306 build/trans_presets.java:340
-#: build/trans_presets.java:388 build/trans_presets.java:412
-#: build/trans_presets.java:438 build/trans_presets.java:457
-#: build/trans_presets.java:481 build/trans_presets.java:511
-#: build/trans_presets.java:531 build/trans_presets.java:554
-#: build/trans_presets.java:576 build/trans_presets.java:595
-#: build/trans_presets.java:618 build/trans_presets.java:1248
+#: build/trans_presets.java:306 build/trans_presets.java:339
+#: build/trans_presets.java:358 build/trans_presets.java:407
+#: build/trans_presets.java:431 build/trans_presets.java:459
+#: build/trans_presets.java:483 build/trans_presets.java:510
+#: build/trans_presets.java:530 build/trans_presets.java:553
+#: build/trans_presets.java:575 build/trans_presets.java:593
+#: build/trans_presets.java:613 build/trans_presets.java:1241
 msgid "Tunnel"
 msgstr "隧道"
@@ -19581,6 +19605,6 @@
 #. item "Highways/Streets/Service" check "Tunnel"
 #. item "Highways/Streets/Road (Unknown Type)" check "Tunnel"
+#. item "Highways/Streets/Construction" check "Tunnel"
 #. item "Highways/Streets/Roundabout" check "Tunnel"
-#. item "Ways/Construction" check "Tunnel"
 #. item "Ways/Track" check "Tunnel"
 #. item "Ways/Path" check "Tunnel"
@@ -19598,11 +19622,11 @@
 #: build/trans_presets.java:233 build/trans_presets.java:252
 #: build/trans_presets.java:270 build/trans_presets.java:288
-#: build/trans_presets.java:307 build/trans_presets.java:341
-#: build/trans_presets.java:389 build/trans_presets.java:439
-#: build/trans_presets.java:458 build/trans_presets.java:482
-#: build/trans_presets.java:512 build/trans_presets.java:532
-#: build/trans_presets.java:555 build/trans_presets.java:577
-#: build/trans_presets.java:596 build/trans_presets.java:619
-#: build/trans_presets.java:1249
+#: build/trans_presets.java:307 build/trans_presets.java:340
+#: build/trans_presets.java:359 build/trans_presets.java:408
+#: build/trans_presets.java:460 build/trans_presets.java:484
+#: build/trans_presets.java:511 build/trans_presets.java:531
+#: build/trans_presets.java:554 build/trans_presets.java:576
+#: build/trans_presets.java:594 build/trans_presets.java:614
+#: build/trans_presets.java:1242
 msgid "Cutting"
 msgstr "斷開"
@@ -19622,6 +19646,6 @@
 #. item "Highways/Streets/Service" check "Cutting"
 #. item "Highways/Streets/Road (Unknown Type)" check "Cutting"
+#. item "Highways/Streets/Construction" check "Cutting"
 #. item "Highways/Streets/Roundabout" check "Cutting"
-#. item "Ways/Construction" check "Cutting"
 #. item "Ways/Track" check "Cutting"
 #. item "Ways/Path" check "Cutting"
@@ -19639,11 +19663,11 @@
 #: build/trans_presets.java:234 build/trans_presets.java:253
 #: build/trans_presets.java:271 build/trans_presets.java:289
-#: build/trans_presets.java:308 build/trans_presets.java:342
-#: build/trans_presets.java:390 build/trans_presets.java:440
-#: build/trans_presets.java:459 build/trans_presets.java:483
-#: build/trans_presets.java:513 build/trans_presets.java:533
-#: build/trans_presets.java:556 build/trans_presets.java:578
-#: build/trans_presets.java:597 build/trans_presets.java:620
-#: build/trans_presets.java:1250
+#: build/trans_presets.java:308 build/trans_presets.java:341
+#: build/trans_presets.java:360 build/trans_presets.java:409
+#: build/trans_presets.java:461 build/trans_presets.java:485
+#: build/trans_presets.java:512 build/trans_presets.java:532
+#: build/trans_presets.java:555 build/trans_presets.java:577
+#: build/trans_presets.java:595 build/trans_presets.java:615
+#: build/trans_presets.java:1243
 msgid "Embankment"
 msgstr "堤防"
@@ -19781,5 +19805,5 @@
 #. item "Ways/Dedicated Footway" check "Embankment"
 #: build/trans_presets.java:235 build/trans_presets.java:309
-#: build/trans_presets.java:579 build/trans_presets.java:598
+#: build/trans_presets.java:578 build/trans_presets.java:596
 msgid "Passing Places"
 msgstr ""
@@ -19788,12 +19812,15 @@
 #. item "Highways/Streets/Service" text "Max. speed (km/h)"
 #. item "Highways/Streets/Road (Unknown Type)" text "Max. speed (km/h)"
+#. item "Highways/Streets/Construction" text "Max. speed (km/h)"
 #. item "Highways/Streets/Roundabout" combo "Lanes"
 #. item "Highways/Streets/Bridge" text "Max. weight (tonnes)"
 #. item "Highways/Streets/Tunnel" text "Max. speed (km/h)"
-#. item "Ways/Construction" text "Max. speed (km/h)"
 #. item "Ways/Path" text "Max. speed (km/h)"
 #. item "Ways/Dedicated Bridleway" text "Max. speed (km/h)"
-#. item "Ways/Dedicated Footway" text "Max. speed (km/h)"
-#. item "Ways/Steps" text "Max. speed (km/h)"
+#. item "Ways/Dedicated Cycleway" combo "Layer"
+#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
+#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
+#. item "Ways/Dedicated Footway" combo "Layer"
+#. item "Ways/Steps" combo "Layer"
 #. item "Transport/Railway/Bus Guideway" text "Max. speed (km/h)"
 #. item "Public Transport/Railway Platform" text "Reference (track number)"
@@ -19801,13 +19828,13 @@
 #: build/trans_presets.java:238 build/trans_presets.java:256
 #: build/trans_presets.java:274 build/trans_presets.java:292
-#: build/trans_presets.java:313 build/trans_presets.java:346
-#: build/trans_presets.java:393 build/trans_presets.java:409
-#: build/trans_presets.java:423 build/trans_presets.java:445
-#: build/trans_presets.java:469 build/trans_presets.java:498
-#: build/trans_presets.java:517 build/trans_presets.java:537
-#: build/trans_presets.java:559 build/trans_presets.java:582
-#: build/trans_presets.java:604 build/trans_presets.java:624
-#: build/trans_presets.java:1254 build/trans_presets.java:1457
-#: build/trans_presets.java:1502
+#: build/trans_presets.java:313 build/trans_presets.java:345
+#: build/trans_presets.java:365 build/trans_presets.java:412
+#: build/trans_presets.java:428 build/trans_presets.java:442
+#: build/trans_presets.java:467 build/trans_presets.java:496
+#: build/trans_presets.java:515 build/trans_presets.java:535
+#: build/trans_presets.java:557 build/trans_presets.java:580
+#: build/trans_presets.java:598 build/trans_presets.java:617
+#: build/trans_presets.java:1247 build/trans_presets.java:1450
+#: build/trans_presets.java:1495
 msgid "Width (meters)"
 msgstr "寬度 (米)"
@@ -19836,24 +19863,20 @@
 #. item "Highways/Streets/Parking Aisle" check "Oneway"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Layer"
-#. item "Ways/Construction" combo "Layer"
-#. item "Ways/Track" check "Oneway"
-#. item "Ways/Path" check "Oneway"
-#. item "Ways/Dedicated Bridleway" combo "Layer"
-#. item "Ways/Dedicated Cycleway" combo "Layer"
-#. item "Ways/Segregated Foot- and Cycleway" combo "Layer"
-#. item "Ways/Combined Foot- and Cycleway" combo "Layer"
-#. item "Ways/Dedicated Footway" check "Passing Places"
-#. item "Ways/Dedicated Footway" combo "Layer"
-#. item "Ways/Steps" combo "Layer"
+#. item "Highways/Streets/Construction" combo "Layer"
+#. item "Ways/Dedicated Bridleway" text "Name"
+#. item "Ways/Dedicated Cycleway" text "Name"
+#. item "Ways/Segregated Foot- and Cycleway" text "Name"
+#. item "Ways/Combined Foot- and Cycleway" text "Name"
+#. item "Ways/Dedicated Footway" text "Name"
+#. item "Ways/Steps" text "Name"
 #. item "Transport/Railway/Bus Guideway" combo "Layer"
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "Surface"
 msgstr "路面"
@@ -19865,5 +19888,5 @@
 #. item "Highways/Streets/Parking Aisle" combo "Surface"
 #. item "Highways/Streets/Road (Unknown Type)" combo "Surface"
-#. item "Ways/Construction" combo "Surface"
+#. item "Highways/Streets/Construction" combo "Surface"
 #. item "Ways/Track" combo "Surface"
 #. item "Ways/Path" combo "Surface"
@@ -19877,11 +19900,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "paved"
 msgstr "有鋪面的"
@@ -19889,10 +19911,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "unpaved"
 msgstr "沒鋪面的"
@@ -19900,10 +19922,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "asphalt"
 msgstr ""
@@ -19911,11 +19933,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "concrete"
 msgstr "水泥地"
@@ -19923,10 +19944,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "metal"
 msgstr "金屬"
@@ -19934,10 +19955,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252 build/trans_presets.java:2490
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245 build/trans_presets.java:2483
 msgid "wood"
 msgstr "木頭"
@@ -19945,10 +19966,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "paving_stones"
 msgstr ""
@@ -19956,11 +19977,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:599
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "cobblestone"
 msgstr "石子路"
@@ -19968,10 +19988,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "gravel"
 msgstr "碎石路"
@@ -19979,10 +19999,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "pebblestone"
 msgstr ""
@@ -19990,10 +20010,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "compacted"
 msgstr ""
@@ -20001,10 +20021,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:485
-#: build/trans_presets.java:515 build/trans_presets.java:536
-#: build/trans_presets.java:558 build/trans_presets.java:581
-#: build/trans_presets.java:602 build/trans_presets.java:622
-#: build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:479
+#: build/trans_presets.java:507 build/trans_presets.java:527
+#: build/trans_presets.java:550 build/trans_presets.java:572
+#: build/trans_presets.java:591 build/trans_presets.java:610
+#: build/trans_presets.java:1245
 msgid "grass_paver"
 msgstr ""
@@ -20012,10 +20032,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "grass"
 msgstr "草地"
@@ -20023,10 +20043,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "sand"
 msgstr "沙地"
@@ -20034,10 +20054,10 @@
 #: build/trans_presets.java:255 build/trans_presets.java:273
 #: build/trans_presets.java:291 build/trans_presets.java:311
-#: build/trans_presets.java:326 build/trans_presets.java:344
-#: build/trans_presets.java:442 build/trans_presets.java:461
-#: build/trans_presets.java:485 build/trans_presets.java:515
-#: build/trans_presets.java:536 build/trans_presets.java:558
-#: build/trans_presets.java:581 build/trans_presets.java:602
-#: build/trans_presets.java:622 build/trans_presets.java:1252
+#: build/trans_presets.java:326 build/trans_presets.java:343
+#: build/trans_presets.java:362 build/trans_presets.java:456
+#: build/trans_presets.java:479 build/trans_presets.java:507
+#: build/trans_presets.java:527 build/trans_presets.java:550
+#: build/trans_presets.java:572 build/trans_presets.java:591
+#: build/trans_presets.java:610 build/trans_presets.java:1245
 msgid "ground"
 msgstr "地面"
@@ -20118,6 +20138,5 @@
 
 #. </optional>
-#. <separator/>
-#: build/trans_presets.java:330
+#: build/trans_presets.java:329
 msgid "Road (Unknown Type)"
 msgstr "道路（不明的類型）"
@@ -20126,5 +20145,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=road"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=road" />
-#: build/trans_presets.java:333
+#: build/trans_presets.java:332
 msgid "Edit Road of unknown type"
 msgstr "編輯不明類型的道路"
@@ -20132,6 +20151,35 @@
 #. item "Highways/Streets/Road (Unknown Type)" text "Width (meters)"
 #. </optional>
+#: build/trans_presets.java:348
+msgid "Construction"
+msgstr "施工"
+
+#. item "Highways/Streets/Construction"
+#: build/trans_presets.java:349
+msgid "Edit Highway Under Construction"
+msgstr "編輯施工中的公路"
+
+#: build/trans_presets.java:363
+msgid "Junction"
+msgstr "交叉點"
+
+#. item "Highways/Streets/Construction" combo "Junction"
+#. color emergency_access_point
+#. <scale_min>1</scale_min>
+#. <scale_max>50000</scale_max>
+#. </rule>
+#.
+#. <!-- junction tag -->
+#.
+#. <rule>
+#. <condition k="junction" v="roundabout"/>
+#: build/trans_presets.java:363 build/trans_style.java:898
+msgid "roundabout"
+msgstr "圓環"
+
+#. item "Highways/Streets/Construction" text "Width (meters)"
+#. </optional>
 #. <separator/>
-#: build/trans_presets.java:350
+#: build/trans_presets.java:369
 msgid "Road Restrictions"
 msgstr "道路限制"
@@ -20140,15 +20188,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:access"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Key:access" />
-#: build/trans_presets.java:353
+#: build/trans_presets.java:372
 msgid "Edit Road Restrictions"
 msgstr "編輯道路限制"
 
 #. item "Highways/Streets/Road Restrictions" check "Oneway"
-#: build/trans_presets.java:355
+#: build/trans_presets.java:374
 msgid "Toll"
 msgstr "通行費"
 
 #. item "Highways/Streets/Road Restrictions" check "Toll"
-#: build/trans_presets.java:356
+#: build/trans_presets.java:375
 msgid "No exit (cul-de-sac)"
 msgstr "沒有出口（死路）"
@@ -20156,5 +20204,5 @@
 #. item "Highways/Streets/Road Restrictions" check "No exit (cul-de-sac)"
 #. item "Ways/Track" combo "Layer"
-#: build/trans_presets.java:357 build/trans_presets.java:466
+#: build/trans_presets.java:376 build/trans_presets.java:464
 msgid "Access"
 msgstr ""
@@ -20196,28 +20244,27 @@
 #. item "Amenities/Hunting Stand" combo "Lock"
 #. item "Health/Pharmacy" combo "Dispensing"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
 #: build/trans_presets.java:490 build/trans_presets.java:491
 #: build/trans_presets.java:492 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
-#: build/trans_presets.java:534 build/trans_presets.java:600
-#: build/trans_presets.java:676 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1366 build/trans_presets.java:1367
-#: build/trans_presets.java:1370 build/trans_presets.java:1371
-#: build/trans_presets.java:1372 build/trans_presets.java:1491
-#: build/trans_presets.java:1492 build/trans_presets.java:1493
-#: build/trans_presets.java:1785 build/trans_presets.java:1795
-#: build/trans_presets.java:2447 build/trans_presets.java:2448
-#: build/trans_presets.java:2489 build/trans_presets.java:2498
-#: build/trans_presets.java:2499 build/trans_presets.java:2500
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:533 build/trans_presets.java:669
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1359
+#: build/trans_presets.java:1360 build/trans_presets.java:1363
+#: build/trans_presets.java:1364 build/trans_presets.java:1365
+#: build/trans_presets.java:1484 build/trans_presets.java:1485
+#: build/trans_presets.java:1486 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
+#: build/trans_presets.java:2441 build/trans_presets.java:2482
+#: build/trans_presets.java:2491 build/trans_presets.java:2492
+#: build/trans_presets.java:2493 build/trans_presets.java:2783
 msgid "yes"
 msgstr "是"
@@ -20230,10 +20277,10 @@
 #. <rule>
 #. <condition k="access" v="private"/>
-#: build/trans_presets.java:357 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:212
 msgid "private"
@@ -20247,10 +20294,10 @@
 #. <rule>
 #. <condition k="access" v="destination"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 #: build/trans_style.java:219
 msgid "destination"
@@ -20274,97 +20321,97 @@
 #. <rule>
 #. <condition k="access" v="permissive"/>
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_style.java:205
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_style.java:205
 msgid "permissive"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "agricultural"
 msgstr "農業的"
 
-#: build/trans_presets.java:357 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
 msgid "forestry"
 msgstr ""
 
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466
 msgid "delivery"
 msgstr ""
 
 #. item "Amenities/Toilets" combo "Wheelchair"
-#: build/trans_presets.java:357 build/trans_presets.java:358
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:488
+#: build/trans_presets.java:376 build/trans_presets.java:377
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:481
+#: build/trans_presets.java:487 build/trans_presets.java:488
 #: build/trans_presets.java:489 build/trans_presets.java:490
 #: build/trans_presets.java:491 build/trans_presets.java:492
-#: build/trans_presets.java:493 build/trans_presets.java:494
-#: build/trans_presets.java:495 build/trans_presets.java:534
-#: build/trans_presets.java:600 build/trans_presets.java:652
-#: build/trans_presets.java:667 build/trans_presets.java:1162
-#: build/trans_presets.java:1174 build/trans_presets.java:1186
-#: build/trans_presets.java:1198 build/trans_presets.java:1210
-#: build/trans_presets.java:1222 build/trans_presets.java:1234
-#: build/trans_presets.java:1276 build/trans_presets.java:1366
-#: build/trans_presets.java:1367 build/trans_presets.java:1370
-#: build/trans_presets.java:1371 build/trans_presets.java:1372
-#: build/trans_presets.java:1491 build/trans_presets.java:1492
-#: build/trans_presets.java:1493 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
-#: build/trans_presets.java:2448 build/trans_presets.java:2489
-#: build/trans_presets.java:2498 build/trans_presets.java:2499
-#: build/trans_presets.java:2500 build/trans_presets.java:2790
+#: build/trans_presets.java:493 build/trans_presets.java:533
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_presets.java:1269
+#: build/trans_presets.java:1359 build/trans_presets.java:1360
+#: build/trans_presets.java:1363 build/trans_presets.java:1364
+#: build/trans_presets.java:1365 build/trans_presets.java:1484
+#: build/trans_presets.java:1485 build/trans_presets.java:1486
+#: build/trans_presets.java:1778 build/trans_presets.java:1788
+#: build/trans_presets.java:2440 build/trans_presets.java:2441
+#: build/trans_presets.java:2482 build/trans_presets.java:2491
+#: build/trans_presets.java:2492 build/trans_presets.java:2493
+#: build/trans_presets.java:2783
 msgid "no"
 msgstr "否"
 
-#: build/trans_presets.java:358
+#: build/trans_presets.java:377
 msgid "Agricultural"
 msgstr ""
 
-#: build/trans_presets.java:358 build/trans_presets.java:359
-#: build/trans_presets.java:360 build/trans_presets.java:361
-#: build/trans_presets.java:362 build/trans_presets.java:363
-#: build/trans_presets.java:364 build/trans_presets.java:365
-#: build/trans_presets.java:366 build/trans_presets.java:466
-#: build/trans_presets.java:467 build/trans_presets.java:468
-#: build/trans_presets.java:489 build/trans_presets.java:490
-#: build/trans_presets.java:491 build/trans_presets.java:493
-#: build/trans_presets.java:494 build/trans_presets.java:495
+#: build/trans_presets.java:377 build/trans_presets.java:378
+#: build/trans_presets.java:379 build/trans_presets.java:380
+#: build/trans_presets.java:381 build/trans_presets.java:382
+#: build/trans_presets.java:383 build/trans_presets.java:384
+#: build/trans_presets.java:385 build/trans_presets.java:464
+#: build/trans_presets.java:465 build/trans_presets.java:466
+#: build/trans_presets.java:487 build/trans_presets.java:488
+#: build/trans_presets.java:489 build/trans_presets.java:491
+#: build/trans_presets.java:492 build/trans_presets.java:493
 msgid "designated"
 msgstr "已指定"
 
-#: build/trans_presets.java:359 build/trans_presets.java:360
-#: build/trans_presets.java:361 build/trans_presets.java:362
-#: build/trans_presets.java:363 build/trans_presets.java:364
-#: build/trans_presets.java:365 build/trans_presets.java:366
-#: build/trans_presets.java:466 build/trans_presets.java:467
-#: build/trans_presets.java:468 build/trans_presets.java:489
-#: build/trans_presets.java:490 build/trans_presets.java:491
-#: build/trans_presets.java:493 build/trans_presets.java:494
+#: build/trans_presets.java:378 build/trans_presets.java:379
+#: build/trans_presets.java:380 build/trans_presets.java:381
+#: build/trans_presets.java:382 build/trans_presets.java:383
+#: build/trans_presets.java:384 build/trans_presets.java:385
+#: build/trans_presets.java:464 build/trans_presets.java:465
+#: build/trans_presets.java:466 build/trans_presets.java:487
+#: build/trans_presets.java:488 build/trans_presets.java:489
+#: build/trans_presets.java:491 build/trans_presets.java:492
 msgid "official"
 msgstr ""
 
-#: build/trans_presets.java:361
+#: build/trans_presets.java:380
 msgid "Goods"
 msgstr "貨物"
 
-#: build/trans_presets.java:362
+#: build/trans_presets.java:381
 msgid "Heavy Goods Vehicles (hgv)"
 msgstr "大型車 (hgv)"
@@ -20379,10 +20426,10 @@
 #. item "Barriers/Bump Gate" check "Bicycle"
 #. item "Barriers/Sally Port" check "Bicycle"
-#: build/trans_presets.java:363 build/trans_presets.java:491
-#: build/trans_presets.java:753 build/trans_presets.java:786
-#: build/trans_presets.java:808 build/trans_presets.java:845
-#: build/trans_presets.java:858 build/trans_presets.java:870
-#: build/trans_presets.java:882 build/trans_presets.java:894
-#: build/trans_presets.java:934
+#: build/trans_presets.java:382 build/trans_presets.java:489
+#: build/trans_presets.java:746 build/trans_presets.java:779
+#: build/trans_presets.java:801 build/trans_presets.java:838
+#: build/trans_presets.java:851 build/trans_presets.java:863
+#: build/trans_presets.java:875 build/trans_presets.java:887
+#: build/trans_presets.java:927
 msgid "Horse"
 msgstr "馬"
@@ -20398,10 +20445,10 @@
 #. item "Barriers/Bump Gate" check "Horse"
 #. item "Barriers/Sally Port" check "Horse"
-#: build/trans_presets.java:364 build/trans_presets.java:467
-#: build/trans_presets.java:754 build/trans_presets.java:772
-#: build/trans_presets.java:787 build/trans_presets.java:809
-#: build/trans_presets.java:846 build/trans_presets.java:859
-#: build/trans_presets.java:871 build/trans_presets.java:883
-#: build/trans_presets.java:895 build/trans_presets.java:935
+#: build/trans_presets.java:383 build/trans_presets.java:465
+#: build/trans_presets.java:747 build/trans_presets.java:765
+#: build/trans_presets.java:780 build/trans_presets.java:802
+#: build/trans_presets.java:839 build/trans_presets.java:852
+#: build/trans_presets.java:864 build/trans_presets.java:876
+#: build/trans_presets.java:888 build/trans_presets.java:928
 msgid "Motorcycle"
 msgstr "機車"
@@ -20416,19 +20463,19 @@
 #. item "Barriers/Bump Gate" check "Motorcycle"
 #. item "Barriers/Sally Port" check "Motorcycle"
-#: build/trans_presets.java:365 build/trans_presets.java:468
-#: build/trans_presets.java:495 build/trans_presets.java:773
-#: build/trans_presets.java:788 build/trans_presets.java:810
-#: build/trans_presets.java:847 build/trans_presets.java:860
-#: build/trans_presets.java:872 build/trans_presets.java:884
-#: build/trans_presets.java:896 build/trans_presets.java:936
+#: build/trans_presets.java:384 build/trans_presets.java:466
+#: build/trans_presets.java:493 build/trans_presets.java:766
+#: build/trans_presets.java:781 build/trans_presets.java:803
+#: build/trans_presets.java:840 build/trans_presets.java:853
+#: build/trans_presets.java:865 build/trans_presets.java:877
+#: build/trans_presets.java:889 build/trans_presets.java:929
 msgid "Motorcar"
 msgstr "汽車"
 
-#: build/trans_presets.java:366
+#: build/trans_presets.java:385
 msgid "Public Service Vehicles (psv)"
 msgstr "公共汽車 (psv)"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. speed (km/h)"
-#: build/trans_presets.java:368
+#: build/trans_presets.java:387
 msgid "Min. speed (km/h)"
 msgstr "最低限速 (km/h)"
@@ -20436,20 +20483,20 @@
 #. item "Highways/Streets/Road Restrictions" text "Min. speed (km/h)"
 #. item "Highways/Streets/Bridge" text "Max. speed (km/h)"
-#: build/trans_presets.java:369 build/trans_presets.java:408
+#: build/trans_presets.java:388 build/trans_presets.java:427
 msgid "Max. weight (tonnes)"
 msgstr "總重限制（噸）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. weight (tonnes)"
-#: build/trans_presets.java:370
+#: build/trans_presets.java:389
 msgid "Max. Height (meters)"
 msgstr "高度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Height (meters)"
-#: build/trans_presets.java:371
+#: build/trans_presets.java:390
 msgid "Max. Width (meters)"
 msgstr "寬度限制（米）"
 
 #. item "Highways/Streets/Road Restrictions" text "Max. Width (meters)"
-#: build/trans_presets.java:372
+#: build/trans_presets.java:391
 msgid "Max. Length (meters)"
 msgstr "長度限制（米）"
@@ -20457,5 +20504,5 @@
 #. item "Highways/Streets/Road Restrictions" text "Max. Length (meters)"
 #. <separator/>
-#: build/trans_presets.java:375
+#: build/trans_presets.java:394
 msgid "Roundabout"
 msgstr "圓環"
@@ -20466,5 +20513,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:junction=roundabout"
 #. ro.href="http://wiki.openstreetmap.org/wiki/Ro:Tag:junction=roundabout" />
-#: build/trans_presets.java:380
+#: build/trans_presets.java:399
 msgid "Edit Junction"
 msgstr "編輯交叉點"
@@ -20484,10 +20531,10 @@
 #. <rule>
 #. <condition k="highway" v="motorway_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:553
+#: build/trans_presets.java:402 build/trans_style.java:553
 #: build/trans_style.java:561
 msgid "motorway"
 msgstr "高速公路"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "motorway_link"
 msgstr "高速公路連絡道路"
@@ -20509,10 +20556,10 @@
 #. <rule>
 #. <condition k="highway" v="trunk_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:569
+#: build/trans_presets.java:402 build/trans_style.java:569
 #: build/trans_style.java:577
 msgid "trunk"
 msgstr "快速道路"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "trunk_link"
 msgstr "快速道路連絡道路"
@@ -20534,10 +20581,10 @@
 #. <rule>
 #. <condition k="highway" v="primary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:585
+#: build/trans_presets.java:402 build/trans_style.java:585
 #: build/trans_style.java:593
 msgid "primary"
 msgstr "省道"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "primary_link"
 msgstr "省道連絡道路"
@@ -20559,5 +20606,5 @@
 #. <rule>
 #. <condition k="highway" v="secondary_link"/>
-#: build/trans_presets.java:383 build/trans_style.java:601
+#: build/trans_presets.java:402 build/trans_style.java:601
 #: build/trans_style.java:609
 msgid "secondary"
@@ -20572,9 +20619,9 @@
 #. <rule>
 #. <condition k="highway" v="tertiary"/>
-#: build/trans_presets.java:383 build/trans_style.java:617
+#: build/trans_presets.java:402 build/trans_style.java:617
 msgid "tertiary"
 msgstr "鄉道"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "unclassified"
 msgstr "未分類的"
@@ -20588,9 +20635,9 @@
 #. <rule>
 #. <condition k="landuse" v="residential"/>
-#: build/trans_presets.java:383 build/trans_style.java:3252
+#: build/trans_presets.java:402 build/trans_style.java:3252
 msgid "residential"
 msgstr "居住的"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "living_street"
 msgstr "生活街道"
@@ -20620,10 +20667,10 @@
 #. <condition k="public_transport" v="platform"/>
 #. <icon annotate="true" src="misc/no_icon.png"/>
-#: build/trans_presets.java:383 build/trans_style.java:673
+#: build/trans_presets.java:402 build/trans_style.java:673
 #: build/trans_style.java:4357
 msgid "service"
 msgstr "巷/弄"
 
-#: build/trans_presets.java:383
+#: build/trans_presets.java:402
 msgid "bus_guideway"
 msgstr "公車專用道"
@@ -20653,5 +20700,5 @@
 #. <condition k="landuse" v="construction"/>
 #. color construction
-#: build/trans_presets.java:383 build/trans_style.java:880
+#: build/trans_presets.java:402 build/trans_style.java:880
 #: build/trans_style.java:3317 build/trans_style.java:3318
 msgid "construction"
@@ -20663,10 +20710,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Key:bridge"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Key:bridge" />
-#: build/trans_presets.java:401
+#: build/trans_presets.java:420
 msgid "Edit Bridge"
 msgstr "編輯橋樑"
 
 #. item "Highways/Streets/Tunnel"
-#: build/trans_presets.java:413
+#: build/trans_presets.java:432
 msgid "Edit Tunnel"
 msgstr "編輯隧道"
@@ -20674,39 +20721,10 @@
 #. item "Highways/Streets/Tunnel" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:427
+#: build/trans_presets.java:446
 msgid "Ways"
 msgstr "路徑"
 
 #. group "Ways"
-#: build/trans_presets.java:428
-msgid "Construction"
-msgstr "施工"
-
-#. item "Ways/Construction"
-#: build/trans_presets.java:429
-msgid "Edit Highway Under Construction"
-msgstr "編輯施工中的公路"
-
-#: build/trans_presets.java:443
-msgid "Junction"
-msgstr "交叉點"
-
-#. item "Ways/Construction" combo "Junction"
-#. color emergency_access_point
-#. <scale_min>1</scale_min>
-#. <scale_max>50000</scale_max>
-#. </rule>
-#.
-#. <!-- junction tag -->
-#.
-#. <rule>
-#. <condition k="junction" v="roundabout"/>
-#: build/trans_presets.java:443 build/trans_style.java:898
-msgid "roundabout"
-msgstr "圓環"
-
-#. item "Ways/Construction" text "Width (meters)"
-#. </optional>
-#: build/trans_presets.java:448
+#: build/trans_presets.java:447
 msgid "Track"
 msgstr "產業道路"
@@ -20715,73 +20733,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=track"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=track" />
-#: build/trans_presets.java:451
+#: build/trans_presets.java:450
 msgid "Edit Track"
 msgstr "編輯產業道路"
 
-#: build/trans_presets.java:462
+#. item "Ways/Track" text "Name"
+#: build/trans_presets.java:455
 msgid "Tracktype"
 msgstr ""
 
 #. item "Ways/Track" combo "Tracktype"
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade1"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade2"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade3"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade4"
 msgstr ""
 
-#: build/trans_presets.java:462
+#: build/trans_presets.java:455
 msgid "grade5"
 msgstr ""
 
-#: build/trans_presets.java:463 build/trans_presets.java:486
+#: build/trans_presets.java:457 build/trans_presets.java:480
 msgid "MTB Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "MTB Scale"
-#. item "Ways/Path" combo "MTB Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "SAC Scale"
-msgstr ""
-
-#. item "Ways/Track" combo "SAC Scale"
-#. item "Ways/Path" combo "SAC Scale"
-#: build/trans_presets.java:464 build/trans_presets.java:487
-#: build/trans_presets.java:3221
-msgid "hiking"
-msgstr "健行"
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_mountain_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "demanding_alpine_hiking"
-msgstr ""
-
-#: build/trans_presets.java:464 build/trans_presets.java:487
-msgid "difficult_alpine_hiking"
 msgstr ""
 
 #. item "Ways/Track" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:472
+#: build/trans_presets.java:470
 msgid "Path"
 msgstr "路徑"
@@ -20790,38 +20776,68 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=path"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=path" />
-#: build/trans_presets.java:475
+#: build/trans_presets.java:473
 msgid "Edit Path"
 msgstr "編輯小徑"
 
+#. item "Ways/Path" text "Name"
+#: build/trans_presets.java:478
+msgid "SAC Scale"
+msgstr ""
+
+#. item "Ways/Path" combo "SAC Scale"
+#: build/trans_presets.java:478 build/trans_presets.java:3214
+msgid "hiking"
+msgstr "健行"
+
+#: build/trans_presets.java:478
+msgid "mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_mountain_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "demanding_alpine_hiking"
+msgstr ""
+
+#: build/trans_presets.java:478
+msgid "difficult_alpine_hiking"
+msgstr ""
+
 #. item "Ways/Path" combo "Visibility"
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "excellent"
 msgstr "極好"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "good"
 msgstr "良好"
 
-#: build/trans_presets.java:488 build/trans_presets.java:2049
+#: build/trans_presets.java:481 build/trans_presets.java:2042
 msgid "intermediate"
 msgstr "中級"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "bad"
 msgstr "差"
 
-#: build/trans_presets.java:488
+#: build/trans_presets.java:481
 msgid "horrible"
 msgstr ""
 
-#: build/trans_presets.java:492
+#: build/trans_presets.java:490
 msgid "Wheelchairs"
 msgstr ""
 
-#: build/trans_presets.java:493
+#: build/trans_presets.java:491
 msgid "Ski"
 msgstr "滑雪"
 
-#: build/trans_presets.java:494
+#: build/trans_presets.java:492
 msgid "Snowmobile"
 msgstr "雪上摩托車"
@@ -20830,5 +20846,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:502
+#: build/trans_presets.java:500
 msgid "Dedicated Bridleway"
 msgstr ""
@@ -20836,5 +20852,5 @@
 #. item "Ways/Dedicated Bridleway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bridleway" />
-#: build/trans_presets.java:504
+#: build/trans_presets.java:502
 msgid "Edit Bridleway"
 msgstr "編輯馬道"
@@ -20842,5 +20858,5 @@
 #. item "Ways/Dedicated Bridleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:520
+#: build/trans_presets.java:518
 msgid "Dedicated Cycleway"
 msgstr ""
@@ -20858,11 +20874,11 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=cycleway"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=cycleway" />
-#: build/trans_presets.java:524 build/trans_presets.java:544
-#: build/trans_presets.java:566
+#: build/trans_presets.java:522 build/trans_presets.java:542
+#: build/trans_presets.java:564
 msgid "Edit Cycleway"
 msgstr "編輯自行車道"
 
 #. item "Ways/Dedicated Cycleway" check "Embankment"
-#: build/trans_presets.java:534
+#: build/trans_presets.java:533
 msgid "Pedestrians"
 msgstr ""
@@ -20870,5 +20886,5 @@
 #. item "Ways/Dedicated Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:540
+#: build/trans_presets.java:538
 msgid "Segregated Foot- and Cycleway"
 msgstr ""
@@ -20876,5 +20892,5 @@
 #. item "Ways/Segregated Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:562
+#: build/trans_presets.java:560
 msgid "Combined Foot- and Cycleway"
 msgstr ""
@@ -20882,5 +20898,5 @@
 #. item "Ways/Combined Foot- and Cycleway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:585
+#: build/trans_presets.java:583
 msgid "Dedicated Footway"
 msgstr ""
@@ -20889,15 +20905,11 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=footway"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=footway" />
-#: build/trans_presets.java:588
+#: build/trans_presets.java:586
 msgid "Edit Footway"
 msgstr "編輯人行步道"
 
-#: build/trans_presets.java:600
-msgid "Bikes"
-msgstr ""
-
 #. item "Ways/Dedicated Footway" text "Width (meters)"
 #. </optional>
-#: build/trans_presets.java:607
+#: build/trans_presets.java:601
 msgid "Steps"
 msgstr "階梯"
@@ -20907,10 +20919,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=steps"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:highway=steps" />
-#: build/trans_presets.java:611
+#: build/trans_presets.java:605
 msgid "Edit Flight of Steps"
 msgstr "編輯階梯"
 
 #. group "Waypoints"
-#: build/trans_presets.java:629
+#: build/trans_presets.java:622
 msgid "Motorway Junction"
 msgstr "高速公路交流道"
@@ -20918,15 +20930,15 @@
 #. item "Waypoints/Motorway Junction"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=motorway_junction" />
-#: build/trans_presets.java:631
+#: build/trans_presets.java:624
 msgid "Edit Motorway Junction"
 msgstr "編輯高速公路交流道"
 
 #. item "Waypoints/Motorway Junction" text "Name"
-#: build/trans_presets.java:635
+#: build/trans_presets.java:628
 msgid "Number"
 msgstr "編號"
 
 #. item "Waypoints/Motorway Junction" text "Number"
-#: build/trans_presets.java:637
+#: build/trans_presets.java:630
 msgid "Services"
 msgstr "休息站"
@@ -20934,5 +20946,5 @@
 #. item "Waypoints/Services"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=services" />
-#: build/trans_presets.java:639
+#: build/trans_presets.java:632
 msgid "Edit Service Station"
 msgstr "編輯休息站"
@@ -20972,17 +20984,17 @@
 #. item "Health/Emergency Access Point" text "Point Name"
 #. item "Relations/Route" text "Network"
-#: build/trans_presets.java:644 build/trans_presets.java:797
-#: build/trans_presets.java:1337 build/trans_presets.java:1379
-#: build/trans_presets.java:1385 build/trans_presets.java:1393
-#: build/trans_presets.java:1400 build/trans_presets.java:1783
-#: build/trans_presets.java:1793 build/trans_presets.java:2222
-#: build/trans_presets.java:2324 build/trans_presets.java:2354
-#: build/trans_presets.java:2407 build/trans_presets.java:2415
-#: build/trans_presets.java:2432 build/trans_presets.java:2445
-#: build/trans_presets.java:2454 build/trans_presets.java:2461
-#: build/trans_presets.java:2526 build/trans_presets.java:2536
-#: build/trans_presets.java:2588 build/trans_presets.java:2754
-#: build/trans_presets.java:2769 build/trans_presets.java:2808
-#: build/trans_presets.java:3228
+#: build/trans_presets.java:637 build/trans_presets.java:790
+#: build/trans_presets.java:1330 build/trans_presets.java:1372
+#: build/trans_presets.java:1378 build/trans_presets.java:1386
+#: build/trans_presets.java:1393 build/trans_presets.java:1776
+#: build/trans_presets.java:1786 build/trans_presets.java:2215
+#: build/trans_presets.java:2317 build/trans_presets.java:2347
+#: build/trans_presets.java:2400 build/trans_presets.java:2408
+#: build/trans_presets.java:2425 build/trans_presets.java:2438
+#: build/trans_presets.java:2447 build/trans_presets.java:2454
+#: build/trans_presets.java:2519 build/trans_presets.java:2529
+#: build/trans_presets.java:2730 build/trans_presets.java:2747
+#: build/trans_presets.java:2762 build/trans_presets.java:2801
+#: build/trans_presets.java:3221
 msgid "Operator"
 msgstr "經營者"
@@ -20991,5 +21003,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:648
+#: build/trans_presets.java:641
 msgid "Traffic Signal"
 msgstr "交通號誌"
@@ -20999,5 +21011,5 @@
 #. <key key="highway" value="traffic_signals" />
 #. <optional>
-#: build/trans_presets.java:652
+#: build/trans_presets.java:645
 msgid "Pedestrian crossing type"
 msgstr "行人穿越道類型"
@@ -21006,27 +21018,27 @@
 #. item "Waypoints/Pedestrian Crossing" combo "Type"
 #. item "Transport/Railway/Crossing" combo "Crossing type"
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "uncontrolled"
 msgstr "沒有號誌"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "traffic_signals"
 msgstr "交通號誌"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "island"
 msgstr "安全島"
 
-#: build/trans_presets.java:652 build/trans_presets.java:667
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:645 build/trans_presets.java:660
+#: build/trans_presets.java:1269
 msgid "unmarked"
 msgstr "未畫標記"
 
 #. item "Waypoints/Pedestrian Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:653 build/trans_presets.java:669
-#: build/trans_presets.java:1277
+#: build/trans_presets.java:646 build/trans_presets.java:662
+#: build/trans_presets.java:1270
 msgid "Cross on horseback"
 msgstr ""
@@ -21034,6 +21046,6 @@
 #. item "Waypoints/Traffic Signal" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross on horseback"
-#: build/trans_presets.java:654 build/trans_presets.java:668
-#: build/trans_presets.java:1278
+#: build/trans_presets.java:647 build/trans_presets.java:661
+#: build/trans_presets.java:1271
 msgid "Cross by bicycle"
 msgstr "以自行車穿越"
@@ -21042,11 +21054,11 @@
 #. item "Waypoints/Pedestrian Crossing" check "Cross on horseback"
 #. item "Transport/Railway/Crossing" check "Cross by bicycle"
-#: build/trans_presets.java:655 build/trans_presets.java:670
-#: build/trans_presets.java:1279
+#: build/trans_presets.java:648 build/trans_presets.java:663
+#: build/trans_presets.java:1272
 msgid "Crossing attendant"
 msgstr "有人陪同穿越"
 
 #. item "Waypoints/Traffic Signal" check "Crossing attendant"
-#: build/trans_presets.java:656
+#: build/trans_presets.java:649
 msgid "Crossing type name (UK)"
 msgstr "行人穿越道類型名稱 (英國)"
@@ -21054,30 +21066,30 @@
 #. item "Waypoints/Traffic Signal" combo "Crossing type name (UK)"
 #. item "Waypoints/Pedestrian Crossing" combo "Type name (UK)"
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "zebra"
 msgstr "斑馬線"
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pelican"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "toucan"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "puffin"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "pegasus"
 msgstr ""
 
-#: build/trans_presets.java:656 build/trans_presets.java:671
+#: build/trans_presets.java:649 build/trans_presets.java:664
 msgid "tiger"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:659
+#: build/trans_presets.java:652
 msgid "Stop"
 msgstr "禁止通行"
@@ -21085,5 +21097,5 @@
 #. item "Waypoints/Stop"
 #. <key key="highway" value="stop" />
-#: build/trans_presets.java:662
+#: build/trans_presets.java:655
 msgid "Pedestrian Crossing"
 msgstr "行人穿越道"
@@ -21092,14 +21104,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:crossing"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=crossing" />
-#: build/trans_presets.java:665
+#: build/trans_presets.java:658
 msgid "Edit Crossing"
 msgstr "編輯行人穿越道"
 
 #. item "Waypoints/Pedestrian Crossing" check "Crossing attendant"
-#: build/trans_presets.java:671
+#: build/trans_presets.java:664
 msgid "Type name (UK)"
 msgstr "類型名稱 (英國)"
 
-#: build/trans_presets.java:673
+#: build/trans_presets.java:666
 msgid "Traffic Calming"
 msgstr ""
@@ -21107,33 +21119,33 @@
 #. item "Waypoints/Traffic Calming"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:traffic_calming"/>
-#: build/trans_presets.java:675
+#: build/trans_presets.java:668
 msgid "Edit Traffic Calming"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "bump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "chicane"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "choker"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "cushion"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "hump"
 msgstr ""
 
-#: build/trans_presets.java:676
+#: build/trans_presets.java:669
 msgid "table"
 msgstr ""
 
-#: build/trans_presets.java:678
+#: build/trans_presets.java:671
 msgid "Passing Place"
 msgstr ""
@@ -21141,5 +21153,5 @@
 #. item "Waypoints/Passing Place"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=passing_place"/>
-#: build/trans_presets.java:680
+#: build/trans_presets.java:673
 msgid "Edit Passing Place"
 msgstr ""
@@ -21147,5 +21159,5 @@
 #. item "Waypoints/Passing Place" label "Edit Passing Place"
 #. <key key="highway" value="passing_place" />
-#: build/trans_presets.java:683
+#: build/trans_presets.java:676
 msgid "Mini-roundabout"
 msgstr "小型圓環"
@@ -21156,14 +21168,14 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:highway=mini_roundabout" />
 #. <key key="highway" value="mini_roundabout" />
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "Direction"
 msgstr "方向"
 
 #. item "Waypoints/Mini-roundabout" combo "Direction"
-#: build/trans_presets.java:688
+#: build/trans_presets.java:681
 msgid "clockwise"
 msgstr "順時針"
 
-#: build/trans_presets.java:690
+#: build/trans_presets.java:683
 msgid "Turning Circle"
 msgstr ""
@@ -21173,5 +21185,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=turning_circle" />
 #. <key key="highway" value="turning_circle" />
-#: build/trans_presets.java:695
+#: build/trans_presets.java:688
 msgid "City Limit"
 msgstr "城市邊界"
@@ -21179,15 +21191,15 @@
 #. item "Waypoints/City Limit"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:traffic_sign%3Dcity_limit" />
-#: build/trans_presets.java:697
+#: build/trans_presets.java:690
 msgid "Edit City Limit Sign"
 msgstr "編輯城市邊界標誌"
 
 #. item "Waypoints/City Limit" text "Name"
-#: build/trans_presets.java:702
+#: build/trans_presets.java:695
 msgid "Second Name"
 msgstr "第二名稱"
 
 #. item "Waypoints/City Limit" text "Second Name"
-#: build/trans_presets.java:704
+#: build/trans_presets.java:697
 msgid "Speed Camera"
 msgstr "測速照相"
@@ -21196,5 +21208,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway%3Dspeed_camera" />
 #. <key key="highway" value="speed_camera" />
-#: build/trans_presets.java:708
+#: build/trans_presets.java:701
 msgid "Emergency Phone"
 msgstr "緊急電話"
@@ -21202,5 +21214,5 @@
 #. item "Waypoints/Emergency Phone"
 #. <key key="amenity" value="emergency_phone" />
-#: build/trans_presets.java:711
+#: build/trans_presets.java:704
 msgid "Incline"
 msgstr "坡"
@@ -21208,5 +21220,5 @@
 #. item "Waypoints/Incline"
 #. <key key="highway" value="incline" />
-#: build/trans_presets.java:714
+#: build/trans_presets.java:707
 msgid "Incline Steep"
 msgstr "險升/降坡"
@@ -21214,5 +21226,5 @@
 #. item "Waypoints/Incline Steep"
 #. <key key="highway" value="incline_steep" />
-#: build/trans_presets.java:717
+#: build/trans_presets.java:710
 msgid "Grit Bin"
 msgstr ""
@@ -21222,10 +21234,10 @@
 #. <key key="amenity" value="grit_bin" />
 #. <separator/>
-#: build/trans_presets.java:722
+#: build/trans_presets.java:715
 msgid "Ford"
 msgstr "淺灘"
 
 #. item "Waypoints/Ford"
-#: build/trans_presets.java:723
+#: build/trans_presets.java:716
 msgid "Edit Ford"
 msgstr "編輯淺灘"
@@ -21233,5 +21245,5 @@
 #. item "Waypoints/Ford" text "Name"
 #. </optional>
-#: build/trans_presets.java:730
+#: build/trans_presets.java:723
 msgid "Mountain Pass"
 msgstr "鞍部"
@@ -21239,5 +21251,5 @@
 #. item "Waypoints/Mountain Pass"
 #. <link href="http://wiki.openstreetmap.org/wiki/Key:mountain_pass" />
-#: build/trans_presets.java:732
+#: build/trans_presets.java:725
 msgid "Edit Mountain Pass"
 msgstr "編輯鞍部"
@@ -21249,7 +21261,7 @@
 #. item "Geography/Places/Glacier" text "Name"
 #. item "Geography/Places/Volcano" text "Name"
-#: build/trans_presets.java:737 build/trans_presets.java:1622
-#: build/trans_presets.java:1767 build/trans_presets.java:2922
-#: build/trans_presets.java:2929 build/trans_presets.java:2936
+#: build/trans_presets.java:730 build/trans_presets.java:1615
+#: build/trans_presets.java:1760 build/trans_presets.java:2915
+#: build/trans_presets.java:2922 build/trans_presets.java:2929
 msgid "Elevation"
 msgstr "海拔"
@@ -21257,5 +21269,5 @@
 #. item "Waypoints/Mountain Pass" text "Elevation"
 #. </optional>
-#: build/trans_presets.java:741
+#: build/trans_presets.java:734
 msgid "Barriers"
 msgstr "障礙物"
@@ -21263,5 +21275,5 @@
 #. group "Barriers"
 #. <!-- *** node barriers *** -->
-#: build/trans_presets.java:744
+#: build/trans_presets.java:737
 msgid "Bollard"
 msgstr "車阻柱"
@@ -21269,5 +21281,5 @@
 #. item "Barriers/Bollard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=bollard" />
-#: build/trans_presets.java:746
+#: build/trans_presets.java:739
 msgid "Edit Bollard"
 msgstr "編輯車阻柱"
@@ -21312,16 +21324,16 @@
 #. <space />
 #. <key key="barrier" value="sally_port" />
-#: build/trans_presets.java:749 build/trans_presets.java:768
-#: build/trans_presets.java:782 build/trans_presets.java:804
-#: build/trans_presets.java:841 build/trans_presets.java:854
-#: build/trans_presets.java:866 build/trans_presets.java:878
-#: build/trans_presets.java:890 build/trans_presets.java:902
-#: build/trans_presets.java:912 build/trans_presets.java:921
-#: build/trans_presets.java:930
+#: build/trans_presets.java:742 build/trans_presets.java:761
+#: build/trans_presets.java:775 build/trans_presets.java:797
+#: build/trans_presets.java:834 build/trans_presets.java:847
+#: build/trans_presets.java:859 build/trans_presets.java:871
+#: build/trans_presets.java:883 build/trans_presets.java:895
+#: build/trans_presets.java:905 build/trans_presets.java:914
+#: build/trans_presets.java:923
 msgid "Allowed traffic:"
 msgstr "允許通行方向："
 
 #. item "Barriers/Bollard" check "Motorcycle"
-#: build/trans_presets.java:756
+#: build/trans_presets.java:749
 msgid "Cycle Barrier"
 msgstr "自行車護欄"
@@ -21330,5 +21342,5 @@
 #. <link de.href="http://de.wikipedia.org/wiki/Umlaufgitter" />
 #. <key key="barrier" value="cycle_barrier" />
-#: build/trans_presets.java:760
+#: build/trans_presets.java:753
 msgid "Block"
 msgstr "水泥護欄"
@@ -21336,5 +21348,5 @@
 #. item "Barriers/Block"
 #. <key key="barrier" value="block" />
-#: build/trans_presets.java:763
+#: build/trans_presets.java:756
 msgid "Cattle Grid"
 msgstr "家畜柵欄"
@@ -21342,10 +21354,10 @@
 #. item "Barriers/Cattle Grid"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=cattle_grid" />
-#: build/trans_presets.java:765
+#: build/trans_presets.java:758
 msgid "Edit Cattle Grid"
 msgstr "編輯家畜柵欄"
 
 #. item "Barriers/Cattle Grid" check "Motorcar"
-#: build/trans_presets.java:775
+#: build/trans_presets.java:768
 msgid "Bus Trap"
 msgstr "公車專用道障礙"
@@ -21353,15 +21365,15 @@
 #. item "Barriers/Bus Trap"
 #. <key key="barrier" value="bus_trap" />
-#: build/trans_presets.java:778
+#: build/trans_presets.java:771
 msgid "Spikes"
 msgstr "長釘"
 
 #. item "Barriers/Spikes"
-#: build/trans_presets.java:779
+#: build/trans_presets.java:772
 msgid "Edit Spikes"
 msgstr "編輯長釘"
 
 #. item "Barriers/Spikes" check "Motorcar"
-#: build/trans_presets.java:790
+#: build/trans_presets.java:783
 msgid "Toll Booth"
 msgstr "收費站"
@@ -21369,5 +21381,5 @@
 #. item "Barriers/Toll Booth"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=toll_booth" />
-#: build/trans_presets.java:792
+#: build/trans_presets.java:785
 msgid "Edit Toll Booth"
 msgstr "編輯收費站"
@@ -21375,10 +21387,10 @@
 #. item "Barriers/Toll Booth" text "Operator"
 #. </optional>
-#: build/trans_presets.java:800
+#: build/trans_presets.java:793
 msgid "Border Control"
 msgstr "國境管控站"
 
 #. item "Barriers/Border Control"
-#: build/trans_presets.java:801
+#: build/trans_presets.java:794
 msgid "Edit Border Control"
 msgstr "編輯國境管控站"
@@ -21388,5 +21400,5 @@
 #.
 #. <!-- *** linear barriers *** -->
-#: build/trans_presets.java:815
+#: build/trans_presets.java:808
 msgid "Hedge"
 msgstr "籬笆"
@@ -21397,22 +21409,22 @@
 #. item "Barriers/Fence"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=fence" />
-#: build/trans_presets.java:819 build/trans_presets.java:821
+#: build/trans_presets.java:812 build/trans_presets.java:814
 msgid "Fence"
 msgstr "欄柵"
 
 #. item "Barriers/Fence" combo "Fence"
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wood_fence"
 msgstr ""
 
-#: build/trans_presets.java:821
+#: build/trans_presets.java:814
 msgid "wire_fence"
 msgstr ""
 
-#: build/trans_presets.java:823
+#: build/trans_presets.java:816
 msgid "Wall"
 msgstr "牆"
@@ -21420,5 +21432,5 @@
 #. item "Barriers/Wall"
 #. <key key="barrier" value="wall" />
-#: build/trans_presets.java:826
+#: build/trans_presets.java:819
 msgid "City Wall"
 msgstr "城牆"
@@ -21427,5 +21439,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=city_wall" />
 #. <key key="barrier" value="city_wall" />
-#: build/trans_presets.java:830
+#: build/trans_presets.java:823
 msgid "Retaining Wall"
 msgstr "擋土牆"
@@ -21437,10 +21449,10 @@
 #.
 #. <!-- *** access *** -->
-#: build/trans_presets.java:837
+#: build/trans_presets.java:830
 msgid "Entrance"
 msgstr "入口"
 
 #. item "Barriers/Entrance"
-#: build/trans_presets.java:838
+#: build/trans_presets.java:831
 msgid "Edit Entrance"
 msgstr "編輯入口"
@@ -21448,5 +21460,5 @@
 #. item "Barriers/Entrance" check "Motorcar"
 #. item "Airport/Terminal" text "Name"
-#: build/trans_presets.java:849 build/trans_presets.java:1577
+#: build/trans_presets.java:842 build/trans_presets.java:1570
 msgid "Gate"
 msgstr "閘門"
@@ -21454,50 +21466,50 @@
 #. item "Barriers/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:barrier=gate" />
-#: build/trans_presets.java:851
+#: build/trans_presets.java:844
 msgid "Edit Gate"
 msgstr "編輯閘門"
 
 #. item "Barriers/Gate" check "Motorcar"
-#: build/trans_presets.java:862
+#: build/trans_presets.java:855
 msgid "Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate"
-#: build/trans_presets.java:863
+#: build/trans_presets.java:856
 msgid "Edit Lift Gate"
 msgstr ""
 
 #. item "Barriers/Lift Gate" check "Motorcar"
-#: build/trans_presets.java:874
+#: build/trans_presets.java:867
 msgid "Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate"
-#: build/trans_presets.java:875
+#: build/trans_presets.java:868
 msgid "Edit Hampshire Gate"
 msgstr ""
 
 #. item "Barriers/Hampshire Gate" check "Motorcar"
-#: build/trans_presets.java:886
+#: build/trans_presets.java:879
 msgid "Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate"
-#: build/trans_presets.java:887
+#: build/trans_presets.java:880
 msgid "Edit Bump Gate"
 msgstr ""
 
 #. item "Barriers/Bump Gate" check "Motorcar"
-#: build/trans_presets.java:898
+#: build/trans_presets.java:891
 msgid "Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate"
-#: build/trans_presets.java:899
+#: build/trans_presets.java:892
 msgid "Edit Kissing Gate"
 msgstr ""
 
 #. item "Barriers/Kissing Gate" check "Bicycle"
-#: build/trans_presets.java:907
+#: build/trans_presets.java:900
 msgid "Stile"
 msgstr ""
@@ -21505,25 +21517,25 @@
 #. item "Barriers/Stile"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=stile" />
-#: build/trans_presets.java:909
+#: build/trans_presets.java:902
 msgid "Edit Stile"
 msgstr ""
 
 #. item "Barriers/Stile" check "Bicycle"
-#: build/trans_presets.java:917
+#: build/trans_presets.java:910
 msgid "Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile"
-#: build/trans_presets.java:918
+#: build/trans_presets.java:911
 msgid "Edit Turnstile"
 msgstr ""
 
 #. item "Barriers/Turnstile" check "Bicycle"
-#: build/trans_presets.java:926
+#: build/trans_presets.java:919
 msgid "Sally Port"
 msgstr "城門"
 
 #. item "Barriers/Sally Port"
-#: build/trans_presets.java:927
+#: build/trans_presets.java:920
 msgid "Edit Sally Port"
 msgstr "編輯城門"
@@ -21534,11 +21546,11 @@
 #. item "Water/Water/River" combo "Layer"
 #. <separator/>
-#: build/trans_presets.java:941 build/trans_presets.java:942
-#: build/trans_presets.java:993
+#: build/trans_presets.java:934 build/trans_presets.java:935
+#: build/trans_presets.java:986
 msgid "Water"
 msgstr "水域"
 
 #. group "Water/Water"
-#: build/trans_presets.java:943
+#: build/trans_presets.java:936
 msgid "Spring"
 msgstr "泉"
@@ -21546,5 +21558,5 @@
 #. item "Water/Water/Spring"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=spring" />
-#: build/trans_presets.java:945
+#: build/trans_presets.java:938
 msgid "Edit Spring"
 msgstr "編輯泉"
@@ -21552,5 +21564,5 @@
 #. item "Water/Water/Spring" text "Name"
 #. <separator/>
-#: build/trans_presets.java:950
+#: build/trans_presets.java:943
 msgid "Drain"
 msgstr ""
@@ -21558,10 +21570,10 @@
 #. item "Water/Water/Drain"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=drain" />
-#: build/trans_presets.java:952
+#: build/trans_presets.java:945
 msgid "Edit Drain"
 msgstr ""
 
 #. item "Water/Water/Drain" combo "Layer"
-#: build/trans_presets.java:958
+#: build/trans_presets.java:951
 msgid "Ditch"
 msgstr ""
@@ -21569,10 +21581,10 @@
 #. item "Water/Water/Ditch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=ditch" />
-#: build/trans_presets.java:960
+#: build/trans_presets.java:953
 msgid "Edit Ditch"
 msgstr ""
 
 #. item "Water/Water/Ditch" combo "Layer"
-#: build/trans_presets.java:966
+#: build/trans_presets.java:959
 msgid "Stream"
 msgstr "溪流"
@@ -21580,10 +21592,10 @@
 #. item "Water/Water/Stream"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=stream" />
-#: build/trans_presets.java:968
+#: build/trans_presets.java:961
 msgid "Edit Stream"
 msgstr "編輯溪流"
 
 #. item "Water/Water/Stream" combo "Layer"
-#: build/trans_presets.java:974
+#: build/trans_presets.java:967
 msgid "Canal"
 msgstr "運河"
@@ -21591,10 +21603,10 @@
 #. item "Water/Water/Canal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=canal" />
-#: build/trans_presets.java:976
+#: build/trans_presets.java:969
 msgid "Edit Canal"
 msgstr "編輯運河"
 
 #. item "Water/Water/Canal" combo "Layer"
-#: build/trans_presets.java:982
+#: build/trans_presets.java:975
 msgid "River"
 msgstr "河流"
@@ -21604,5 +21616,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=river"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:waterway=river" />
-#: build/trans_presets.java:986
+#: build/trans_presets.java:979
 msgid "Edit River"
 msgstr "編輯河流"
@@ -21610,15 +21622,15 @@
 #. item "Water/Water/Water"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=water" />
-#: build/trans_presets.java:995
+#: build/trans_presets.java:988
 msgid "Edit Water"
 msgstr "編輯水域"
 
 #. item "Water/Water/Water" text "Name"
-#: build/trans_presets.java:999
+#: build/trans_presets.java:992
 msgid "Land"
 msgstr "陸地"
 
 #. item "Water/Water/Land"
-#: build/trans_presets.java:1000
+#: build/trans_presets.java:993
 msgid "Edit Land"
 msgstr "編輯陸地"
@@ -21626,15 +21638,15 @@
 #. item "Water/Water/Land" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1005
+#: build/trans_presets.java:998
 msgid "Basin"
 msgstr ""
 
 #. item "Water/Water/Basin"
-#: build/trans_presets.java:1006
+#: build/trans_presets.java:999
 msgid "Edit Basin Landuse"
 msgstr ""
 
 #. item "Water/Water/Basin" text "Name"
-#: build/trans_presets.java:1011
+#: build/trans_presets.java:1004
 msgid "Reservoir"
 msgstr "貯水處"
@@ -21642,15 +21654,15 @@
 #. item "Water/Water/Reservoir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=reservoir" />
-#: build/trans_presets.java:1013
+#: build/trans_presets.java:1006
 msgid "Edit Reservoir Landuse"
 msgstr "編輯貯水處"
 
 #. item "Water/Water/Reservoir" text "Name"
-#: build/trans_presets.java:1018
+#: build/trans_presets.java:1011
 msgid "Covered Reservoir"
 msgstr "有覆蓋的貯水處"
 
 #. item "Water/Water/Covered Reservoir"
-#: build/trans_presets.java:1019
+#: build/trans_presets.java:1012
 msgid "Edit Covered Reservoir"
 msgstr "編輯有覆蓋的貯水處"
@@ -21658,5 +21670,5 @@
 #. item "Water/Water/Covered Reservoir" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1024
+#: build/trans_presets.java:1017
 msgid "Riverbank"
 msgstr "河岸"
@@ -21665,10 +21677,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=riverbank"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:waterway=riverbank" />
-#: build/trans_presets.java:1027
+#: build/trans_presets.java:1020
 msgid "Edit Riverbank"
 msgstr "編輯河岸"
 
 #. item "Water/Water/Riverbank" text "Name"
-#: build/trans_presets.java:1031
+#: build/trans_presets.java:1024
 msgid "Wetland"
 msgstr "溼地"
@@ -21679,14 +21691,14 @@
 #. pt.href="http://wiki.openstreetmap.org/wiki/Pt:Tag:natural=wetland"
 #. pt_BR.href="http://wiki.openstreetmap.org/wiki/Pt_br:Tag:natural=wetland" />
-#: build/trans_presets.java:1036
+#: build/trans_presets.java:1029
 msgid "Edit Wetland"
 msgstr "編輯溼地"
 
 #. item "Water/Water/Wetland" combo "Type"
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "swamp"
 msgstr "沼澤"
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "bog"
 msgstr "泥沼"
@@ -21700,35 +21712,35 @@
 #. <condition k="natural" v="wetland"/>
 #. <icon src="misc/no_icon.png"/>
-#: build/trans_presets.java:1039 build/trans_style.java:3484
+#: build/trans_presets.java:1032 build/trans_style.java:3484
 msgid "marsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "reedbed"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "saltmarsh"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "tidalflat"
 msgstr ""
 
-#: build/trans_presets.java:1039
+#: build/trans_presets.java:1032
 msgid "mangrove"
 msgstr "紅樹林"
 
-#: build/trans_presets.java:1041
+#: build/trans_presets.java:1034
 msgid "Mud"
 msgstr ""
 
 #. item "Water/Water/Mud"
-#: build/trans_presets.java:1042
+#: build/trans_presets.java:1035
 msgid "Edit Mud"
 msgstr ""
 
 #. item "Water/Water/Mud" text "Name"
-#: build/trans_presets.java:1046
+#: build/trans_presets.java:1039
 msgid "Beach"
 msgstr "海灘"
@@ -21736,20 +21748,20 @@
 #. item "Water/Water/Beach"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=beach" />
-#: build/trans_presets.java:1048
+#: build/trans_presets.java:1041
 msgid "Edit Beach"
 msgstr "編輯海灘"
 
 #. item "Water/Water/Beach" text "Name"
-#: build/trans_presets.java:1052
+#: build/trans_presets.java:1045
 msgid "Bay"
 msgstr "海灣"
 
 #. item "Water/Water/Bay"
-#: build/trans_presets.java:1053
+#: build/trans_presets.java:1046
 msgid "Edit Bay"
 msgstr "編輯海灣"
 
 #. item "Water/Water/Bay" text "Name"
-#: build/trans_presets.java:1057
+#: build/trans_presets.java:1050
 msgid "Cliff"
 msgstr "斷崖"
@@ -21757,10 +21769,10 @@
 #. item "Water/Water/Cliff"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cliff" />
-#: build/trans_presets.java:1059
+#: build/trans_presets.java:1052
 msgid "Edit Cliff"
 msgstr "編輯斷崖"
 
 #. item "Water/Water/Cliff" text "Name"
-#: build/trans_presets.java:1063
+#: build/trans_presets.java:1056
 msgid "Coastline"
 msgstr "海岸線"
@@ -21768,5 +21780,5 @@
 #. item "Water/Water/Coastline"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=coastline" />
-#: build/trans_presets.java:1065
+#: build/trans_presets.java:1058
 msgid "Edit Coastline"
 msgstr "編輯海岸線"
@@ -21774,5 +21786,5 @@
 #. item "Water/Water/Coastline" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1070
+#: build/trans_presets.java:1063
 msgid "Ferry Route"
 msgstr "渡輪路線"
@@ -21780,5 +21792,5 @@
 #. item "Water/Water/Ferry Route"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:route=ferry" />
-#: build/trans_presets.java:1072
+#: build/trans_presets.java:1065
 msgid "Edit Ferry"
 msgstr "編輯渡輪"
@@ -21787,5 +21799,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1080
+#: build/trans_presets.java:1073
 msgid "Boatyard"
 msgstr ""
@@ -21793,10 +21805,10 @@
 #. item "Water/Water/Boatyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=boatyard" />
-#: build/trans_presets.java:1082
+#: build/trans_presets.java:1075
 msgid "Edit Boatyard"
 msgstr ""
 
 #. item "Water/Water/Boatyard" text "Name"
-#: build/trans_presets.java:1087
+#: build/trans_presets.java:1080
 msgid "Dock"
 msgstr "船塢"
@@ -21804,5 +21816,5 @@
 #. item "Water/Water/Dock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dock" />
-#: build/trans_presets.java:1089
+#: build/trans_presets.java:1082
 msgid "Edit Dock"
 msgstr "編輯船塢"
@@ -21810,5 +21822,5 @@
 #. item "Water/Water/Dock" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1095
+#: build/trans_presets.java:1088
 msgid "Dam"
 msgstr "水壩"
@@ -21816,15 +21828,15 @@
 #. item "Water/Water/Dam"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=dam" />
-#: build/trans_presets.java:1097
+#: build/trans_presets.java:1090
 msgid "Edit Dam"
 msgstr "編輯水壩"
 
 #. item "Water/Water/Dam" text "Name"
-#: build/trans_presets.java:1103
+#: build/trans_presets.java:1096
 msgid "Waterway Point"
 msgstr "水路點"
 
 #. group "Waterway Point"
-#: build/trans_presets.java:1104
+#: build/trans_presets.java:1097
 msgid "Lock Gate"
 msgstr "調節水門"
@@ -21833,5 +21845,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=lock_gate" />
 #. <key key="waterway" value="lock_gate" />
-#: build/trans_presets.java:1108
+#: build/trans_presets.java:1101
 msgid "Weir"
 msgstr "堰"
@@ -21839,20 +21851,20 @@
 #. item "Waterway Point/Weir"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=weir" />
-#: build/trans_presets.java:1110
+#: build/trans_presets.java:1103
 msgid "Edit Weir"
 msgstr "編輯堰"
 
 #. item "Waterway Point/Weir" text "Name"
-#: build/trans_presets.java:1115
+#: build/trans_presets.java:1108
 msgid "Waterfall"
 msgstr "瀑布"
 
 #. item "Waterway Point/Waterfall"
-#: build/trans_presets.java:1116
+#: build/trans_presets.java:1109
 msgid "Edit Waterfall"
 msgstr "編輯瀑布"
 
 #. item "Waterway Point/Waterfall" text "Name"
-#: build/trans_presets.java:1121
+#: build/trans_presets.java:1114
 msgid "Turning Point"
 msgstr ""
@@ -21861,15 +21873,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:waterway=turning_point" />
 #. <key key="waterway" value="turning_point" />
-#: build/trans_presets.java:1125
+#: build/trans_presets.java:1118
 msgid "Marina"
 msgstr "碼頭"
 
 #. item "Waterway Point/Marina"
-#: build/trans_presets.java:1126
+#: build/trans_presets.java:1119
 msgid "Edit Marina"
 msgstr "編輯碼頭"
 
 #. item "Waterway Point/Marina" text "Name"
-#: build/trans_presets.java:1130
+#: build/trans_presets.java:1123
 msgid "Pier"
 msgstr "渡頭"
@@ -21877,10 +21889,10 @@
 #. item "Waterway Point/Pier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pier" />
-#: build/trans_presets.java:1132
+#: build/trans_presets.java:1125
 msgid "Edit Pier"
 msgstr "編輯渡頭"
 
 #. item "Waterway Point/Pier" text "Name"
-#: build/trans_presets.java:1136
+#: build/trans_presets.java:1129
 msgid "Ferry Terminal"
 msgstr "渡輪端點"
@@ -21888,10 +21900,10 @@
 #. item "Waterway Point/Ferry Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=ferry_terminal" />
-#: build/trans_presets.java:1138
+#: build/trans_presets.java:1131
 msgid "Edit Ferry Terminal"
 msgstr "編輯渡輪端點"
 
 #. item "Waterway Point/Ferry Terminal" text "Name"
-#: build/trans_presets.java:1142
+#: build/trans_presets.java:1135
 msgid "Slipway"
 msgstr "船臺"
@@ -21901,20 +21913,20 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:leisure=slipway"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:leisure=slipway" />
-#: build/trans_presets.java:1146
+#: build/trans_presets.java:1139
 msgid "Edit Slipway"
 msgstr "編輯造船臺"
 
 #. item "Waterway Point/Slipway" text "Name"
-#: build/trans_presets.java:1152
+#: build/trans_presets.java:1145
 msgid "Transport"
 msgstr "運輸"
 
 #. group "Transport"
-#: build/trans_presets.java:1153
+#: build/trans_presets.java:1146
 msgid "Railway"
 msgstr "鐵路"
 
 #. group "Transport/Railway"
-#: build/trans_presets.java:1154
+#: build/trans_presets.java:1147
 msgid "Rail"
 msgstr "軌"
@@ -21922,5 +21934,5 @@
 #. item "Transport/Railway/Rail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=rail" />
-#: build/trans_presets.java:1156
+#: build/trans_presets.java:1149
 msgid "Edit Rail"
 msgstr "編輯軌道"
@@ -21950,86 +21962,11 @@
 #. <key key="railway" value="tram" />
 #. <optional>
-#: build/trans_presets.java:1160 build/trans_presets.java:1172
-#: build/trans_presets.java:1196 build/trans_presets.java:1208
-#: build/trans_presets.java:1220 build/trans_presets.java:1232
+#: build/trans_presets.java:1153 build/trans_presets.java:1165
+#: build/trans_presets.java:1189 build/trans_presets.java:1201
+#: build/trans_presets.java:1213 build/trans_presets.java:1225
 msgid "Gauge (mm)"
 msgstr ""
 
 #. item "Transport/Railway/Rail" combo "Gauge (mm)"
-#. <!--
-#. A little help:
-#. 1. every rule starts with <rule> and ends with </rule>
-#. 2. every rule needs a condition
-#. -k for the key (required)
-#. -v for the value as a string
-#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
-#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
-#. tags with the given key - don't forget to set a priority if other rules could also apply.
-#. 3. line attributes
-#. - width absolute width in pixel in every zoom level
-#. - realwidth relative width which will be scaled in meters, integer
-#. - colour
-#. - priority
-#. - dashed x - dashed line, length of dashes / spaces in x pixels
-#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
-#. - dashedcolour second (background) colour of a dashed line
-#. 4. linemod attributes
-#. - all line attributes
-#. - mode ('over' or 'under')
-#. - width can be specified relative to modified way:
-#. +x - <x> pixels are added to way size
-#. -x - <x> pixels are subtracted from way size
-#. x% - the size is <x> percent of modified way
-#. If the size is <= 1 the minimum size of 1 is used.
-#. 5. area attributes
-#. - colour
-#. - priority
-#. - closed (true or false - when true the area style is ignored for unclosed ways)
-#. 6. icon attributes
-#. - icon (path to icon)
-#. - relative to the icon path
-#. - URL's are also supported to allow remote icons (are cached locally)
-#. - priority
-#. - annonate (true or false)
-#. 7. scale_min / scale_max
-#. - zoom scale for display
-#.
-#. Using both area and line attributes for the same key/value pair does work. For areas
-#. first the best matching area rule is searched and the best matching line rule is
-#. connected with it. They need not have the same key/value pair.
-#.
-#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
-#. If both are given, the color name is introduced in preferences with that value. If only
-#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
-#. modified preferences or previous value is used. The 6 hex digit color code can also
-#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
-#.
-#. Linemod's are drawn over or under the line they are associated with and modify the
-#. appearance. There can be multiple linemod's for one way (contrary to line styles,
-#. where only one applies). When drawn over a way either a very small width must be choosen
-#. or an alpha value must be used for the colour field (otherwise the original way is
-#. not visible). When the mod is under the way, then it must be wide enough to be visible
-#. on the sides of the way or the waystyles itself must use alpha channel (which may
-#. look strange).
-#.
-#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
-#. in case they have same priority! Using priority settings helps to solve conflicts.
-#.
-#. For external files the <rules> should have following elements:
-#. - author           the author of the style
-#. - version          a version number of some sort (e.g. creation date)
-#. - description      what is your style meant to be
-#. - shortdescription very short description
-#. - link             a link to a helpful website (optional)
-#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
-#. - name             is the name of the style
-#. - when the style replaces the whole rendering choose a new name
-#. - when the style is additional choose "standard" or don't use name tag
-#. -->
-#.
-#: build/trans_presets.java:1160 build/trans_style.java:72
-msgid "standard"
-msgstr ""
-
 #. item "Transport/Railway/Narrow Gauge Rail" combo "Gauge (mm)"
 #. item "Transport/Railway/Monorail" label "Edit Monorail"
@@ -22041,8 +21978,8 @@
 #. item "Transport/Railway/Subway" combo "Gauge (mm)"
 #. item "Transport/Railway/Tram" combo "Gauge (mm)"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226
 msgid "Types"
 msgstr ""
@@ -22056,29 +21993,29 @@
 #. item "Transport/Railway/Tram" combo "Types"
 #. item "Transport/Railway/Disused Rail" combo "Optional Types"
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "yard"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "siding"
 msgstr ""
 
-#: build/trans_presets.java:1161 build/trans_presets.java:1173
-#: build/trans_presets.java:1185 build/trans_presets.java:1197
-#: build/trans_presets.java:1209 build/trans_presets.java:1221
-#: build/trans_presets.java:1233 build/trans_presets.java:1262
+#: build/trans_presets.java:1154 build/trans_presets.java:1166
+#: build/trans_presets.java:1178 build/trans_presets.java:1190
+#: build/trans_presets.java:1202 build/trans_presets.java:1214
+#: build/trans_presets.java:1226 build/trans_presets.java:1255
 msgid "spur"
 msgstr ""
 
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "Electrified"
 msgstr ""
@@ -22091,8 +22028,8 @@
 #. item "Transport/Railway/Subway" combo "Electrified"
 #. item "Transport/Railway/Tram" combo "Electrified"
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227
 msgid "contact_line"
 msgstr ""
@@ -22163,8 +22100,8 @@
 #. <rule>
 #. <condition k="railway" v="funicular"/>
-#: build/trans_presets.java:1162 build/trans_presets.java:1174
-#: build/trans_presets.java:1186 build/trans_presets.java:1198
-#: build/trans_presets.java:1210 build/trans_presets.java:1222
-#: build/trans_presets.java:1234 build/trans_style.java:756
+#: build/trans_presets.java:1155 build/trans_presets.java:1167
+#: build/trans_presets.java:1179 build/trans_presets.java:1191
+#: build/trans_presets.java:1203 build/trans_presets.java:1215
+#: build/trans_presets.java:1227 build/trans_style.java:756
 #: build/trans_style.java:1182 build/trans_style.java:1246
 #: build/trans_style.java:1254 build/trans_style.java:1263
@@ -22176,8 +22113,8 @@
 #. item "Man Made/Power Line" text "Line reference"
 #. <!-- TODO: voltage values used are a mixture of power lines and railways - needs cleanup -->
-#: build/trans_presets.java:1163 build/trans_presets.java:1175
-#: build/trans_presets.java:1187 build/trans_presets.java:1199
-#: build/trans_presets.java:1211 build/trans_presets.java:1223
-#: build/trans_presets.java:1235 build/trans_presets.java:2435
+#: build/trans_presets.java:1156 build/trans_presets.java:1168
+#: build/trans_presets.java:1180 build/trans_presets.java:1192
+#: build/trans_presets.java:1204 build/trans_presets.java:1216
+#: build/trans_presets.java:1228 build/trans_presets.java:2428
 msgid "Voltage"
 msgstr "電壓"
@@ -22190,8 +22127,8 @@
 #. item "Transport/Railway/Subway" combo "Voltage"
 #. item "Transport/Railway/Tram" combo "Voltage"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "Frequency (Hz)"
 msgstr ""
@@ -22204,23 +22141,23 @@
 #. item "Transport/Railway/Subway" combo "Frequency (Hz)"
 #. item "Transport/Railway/Tram" combo "Frequency (Hz)"
-#: build/trans_presets.java:1164 build/trans_presets.java:1176
-#: build/trans_presets.java:1188 build/trans_presets.java:1200
-#: build/trans_presets.java:1212 build/trans_presets.java:1224
-#: build/trans_presets.java:1236
+#: build/trans_presets.java:1157 build/trans_presets.java:1169
+#: build/trans_presets.java:1181 build/trans_presets.java:1193
+#: build/trans_presets.java:1205 build/trans_presets.java:1217
+#: build/trans_presets.java:1229
 msgid "16.7"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1167
+#: build/trans_presets.java:1160
 msgid "Narrow Gauge Rail"
 msgstr "窄軌"
 
 #. item "Transport/Railway/Narrow Gauge Rail"
-#: build/trans_presets.java:1168
+#: build/trans_presets.java:1161
 msgid "Edit Narrow Gauge Rail"
 msgstr "編輯窄軌"
 
 #. </optional>
-#: build/trans_presets.java:1179
+#: build/trans_presets.java:1172
 msgid "Monorail"
 msgstr "單軌"
@@ -22228,50 +22165,50 @@
 #. item "Transport/Railway/Monorail"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=monorail" />
-#: build/trans_presets.java:1181
+#: build/trans_presets.java:1174
 msgid "Edit Monorail"
 msgstr "編輯單軌"
 
 #. </optional>
-#: build/trans_presets.java:1191
+#: build/trans_presets.java:1184
 msgid "Preserved"
 msgstr "保留鐵路"
 
 #. item "Transport/Railway/Preserved"
-#: build/trans_presets.java:1192
+#: build/trans_presets.java:1185
 msgid "Edit Preserved Railway"
 msgstr "編輯保留的鐵路"
 
 #. </optional>
-#: build/trans_presets.java:1203
+#: build/trans_presets.java:1196
 msgid "Light Rail"
 msgstr "輕軌電車"
 
 #. item "Transport/Railway/Light Rail"
-#: build/trans_presets.java:1204
+#: build/trans_presets.java:1197
 msgid "Edit Light Rail"
 msgstr "編輯輕軌電車"
 
 #. </optional>
-#: build/trans_presets.java:1215
+#: build/trans_presets.java:1208
 msgid "Subway"
 msgstr "地下鐵"
 
 #. item "Transport/Railway/Subway"
-#: build/trans_presets.java:1216
+#: build/trans_presets.java:1209
 msgid "Edit Subway"
 msgstr "編輯地下鐵"
 
 #. </optional>
-#: build/trans_presets.java:1227
+#: build/trans_presets.java:1220
 msgid "Tram"
 msgstr "路面電車"
 
 #. item "Transport/Railway/Tram"
-#: build/trans_presets.java:1228
+#: build/trans_presets.java:1221
 msgid "Edit Tram"
 msgstr "編輯路面電車"
 
 #. </optional>
-#: build/trans_presets.java:1239
+#: build/trans_presets.java:1232
 msgid "Bus Guideway"
 msgstr "導軌道巴士"
@@ -22279,5 +22216,5 @@
 #. item "Transport/Railway/Bus Guideway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=bus_guideway" />
-#: build/trans_presets.java:1241
+#: build/trans_presets.java:1234
 msgid "Edit Bus Guideway"
 msgstr "編輯導軌道巴士"
@@ -22286,10 +22223,10 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1258
+#: build/trans_presets.java:1251
 msgid "Disused Rail"
 msgstr "不使用的軌道"
 
 #. item "Transport/Railway/Disused Rail"
-#: build/trans_presets.java:1259
+#: build/trans_presets.java:1252
 msgid "Edit Disused Railway"
 msgstr "編輯不使用的鐵路"
@@ -22298,9 +22235,9 @@
 #. <space />
 #. <key key="railway" value="disused" />
-#: build/trans_presets.java:1262
+#: build/trans_presets.java:1255
 msgid "Optional Types"
 msgstr "選擇性的類型"
 
-#: build/trans_presets.java:1264
+#: build/trans_presets.java:1257
 msgid "Abandoned Rail"
 msgstr "廢棄的軌道"
@@ -22309,5 +22246,5 @@
 #. <key key="railway" value="abandoned" />
 #. <separator/>
-#: build/trans_presets.java:1268
+#: build/trans_presets.java:1261
 msgid "Level Crossing"
 msgstr "鐵路平交道"
@@ -22316,5 +22253,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=level_crossing" />
 #. <key key="railway" value="level_crossing" />
-#: build/trans_presets.java:1272
+#: build/trans_presets.java:1265
 msgid "Crossing"
 msgstr "平交道"
@@ -22324,5 +22261,5 @@
 #. <key key="railway" value="crossing" />
 #. <optional>
-#: build/trans_presets.java:1276
+#: build/trans_presets.java:1269
 msgid "Crossing type"
 msgstr "平交道類型"
@@ -22330,5 +22267,5 @@
 #. item "Transport/Railway/Crossing" check "Crossing attendant"
 #. </optional>
-#: build/trans_presets.java:1282
+#: build/trans_presets.java:1275
 msgid "Turntable"
 msgstr "調車轉盤"
@@ -22337,5 +22274,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=turntable" />
 #. <key key="railway" value="turntable" />
-#: build/trans_presets.java:1286
+#: build/trans_presets.java:1279
 msgid "Buffer Stop"
 msgstr ""
@@ -22344,10 +22281,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway%3Dbuffer_stop" />
 #. <key key="railway" value="buffer_stop" />
-#: build/trans_presets.java:1291
+#: build/trans_presets.java:1284
 msgid "Aerialway"
 msgstr "空中路線"
 
 #. group "Aerialway"
-#: build/trans_presets.java:1292
+#: build/trans_presets.java:1285
 msgid "Chair Lift"
 msgstr "滑雪纜車"
@@ -22355,10 +22292,10 @@
 #. item "Aerialway/Chair Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=chair_lift" />
-#: build/trans_presets.java:1294
+#: build/trans_presets.java:1287
 msgid "Edit Chair Lift"
 msgstr "編輯滑雪纜車"
 
 #. item "Aerialway/Chair Lift" text "Name"
-#: build/trans_presets.java:1298
+#: build/trans_presets.java:1291
 msgid "Drag Lift"
 msgstr ""
@@ -22366,10 +22303,10 @@
 #. item "Aerialway/Drag Lift"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=drag_lift" />
-#: build/trans_presets.java:1300
+#: build/trans_presets.java:1293
 msgid "Edit Drag Lift"
 msgstr ""
 
 #. item "Aerialway/Drag Lift" text "Name"
-#: build/trans_presets.java:1304
+#: build/trans_presets.java:1297
 msgid "Cable Car"
 msgstr "纜車"
@@ -22377,10 +22314,10 @@
 #. item "Aerialway/Cable Car"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aerialway=cable_car" />
-#: build/trans_presets.java:1306
+#: build/trans_presets.java:1299
 msgid "Edit Cable Car"
 msgstr "編輯纜車"
 
 #. item "Aerialway/Cable Car" text "Name"
-#: build/trans_presets.java:1310
+#: build/trans_presets.java:1303
 msgid "Gondola"
 msgstr ""
@@ -22388,10 +22325,10 @@
 #. item "Aerialway/Gondola"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1312
+#: build/trans_presets.java:1305
 msgid "Edit Gondola"
 msgstr ""
 
 #. item "Aerialway/Gondola" text "Name"
-#: build/trans_presets.java:1316
+#: build/trans_presets.java:1309
 msgctxt "aerialway"
 msgid "Station"
@@ -22400,5 +22337,5 @@
 #. item "Aerialway/Station"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1318
+#: build/trans_presets.java:1311
 msgctxt "aerialway"
 msgid "Edit Station"
@@ -22406,5 +22343,5 @@
 
 #. item "Aerialway/Station" text "Name"
-#: build/trans_presets.java:1322
+#: build/trans_presets.java:1315
 msgctxt "aerialway"
 msgid "Pylon"
@@ -22413,5 +22350,5 @@
 #. item "Aerialway/Pylon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps#aerialway" />
-#: build/trans_presets.java:1324
+#: build/trans_presets.java:1317
 msgctxt "aerialway"
 msgid "Edit Pylon"
@@ -22419,5 +22356,5 @@
 
 #. group "Car"
-#: build/trans_presets.java:1331
+#: build/trans_presets.java:1324
 msgid "Fuel"
 msgstr "加油站"
@@ -22427,62 +22364,62 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=fuel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fuel" />
-#: build/trans_presets.java:1335
+#: build/trans_presets.java:1328
 msgid "Edit Fuel"
 msgstr "編輯加油站"
 
 #. item "Car/Fuel" combo "Operator"
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Agip"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Aral"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Avia"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "BP"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Esso"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "OMV"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Q8"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Repsol"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Shell"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Statoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Tamoil"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Texaco"
 msgstr ""
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Total"
 msgstr "總計"
 
-#: build/trans_presets.java:1337
+#: build/trans_presets.java:1330
 msgid "Indipend."
 msgstr ""
@@ -22540,32 +22477,32 @@
 #. item "Health/Pharmacy" text "Name"
 #. item "Health/Veterinary" text "Name"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1693 build/trans_presets.java:1700
-#: build/trans_presets.java:1708 build/trans_presets.java:1721
-#: build/trans_presets.java:1735 build/trans_presets.java:1832
-#: build/trans_presets.java:1840 build/trans_presets.java:1943
-#: build/trans_presets.java:1949 build/trans_presets.java:2262
-#: build/trans_presets.java:2286 build/trans_presets.java:2527
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1686 build/trans_presets.java:1693
+#: build/trans_presets.java:1701 build/trans_presets.java:1714
+#: build/trans_presets.java:1728 build/trans_presets.java:1825
+#: build/trans_presets.java:1833 build/trans_presets.java:1936
+#: build/trans_presets.java:1942 build/trans_presets.java:2255
+#: build/trans_presets.java:2279 build/trans_presets.java:2520
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Opening Hours"
 msgstr ""
@@ -22624,165 +22561,165 @@
 #. item "Health/Pharmacy" combo "Opening Hours"
 #. item "Health/Veterinary" combo "Opening Hours"
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "24/7"
 msgstr "24/7"
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Mo-Fr 08:30-20:00"
 msgstr ""
 
-#: build/trans_presets.java:1340 build/trans_presets.java:1643
-#: build/trans_presets.java:1651 build/trans_presets.java:1658
-#: build/trans_presets.java:1665 build/trans_presets.java:1671
-#: build/trans_presets.java:1678 build/trans_presets.java:1685
-#: build/trans_presets.java:1700 build/trans_presets.java:1708
-#: build/trans_presets.java:1721 build/trans_presets.java:1735
-#: build/trans_presets.java:1832 build/trans_presets.java:1840
-#: build/trans_presets.java:1943 build/trans_presets.java:1949
-#: build/trans_presets.java:2262 build/trans_presets.java:2286
-#: build/trans_presets.java:2549 build/trans_presets.java:2555
-#: build/trans_presets.java:2562 build/trans_presets.java:2569
-#: build/trans_presets.java:2575 build/trans_presets.java:2581
-#: build/trans_presets.java:2603 build/trans_presets.java:2610
-#: build/trans_presets.java:2617 build/trans_presets.java:2623
-#: build/trans_presets.java:2630 build/trans_presets.java:2636
-#: build/trans_presets.java:2642 build/trans_presets.java:2648
-#: build/trans_presets.java:2654 build/trans_presets.java:2660
-#: build/trans_presets.java:2667 build/trans_presets.java:2674
-#: build/trans_presets.java:2681 build/trans_presets.java:2687
-#: build/trans_presets.java:2693 build/trans_presets.java:2699
-#: build/trans_presets.java:2705 build/trans_presets.java:2711
-#: build/trans_presets.java:2718 build/trans_presets.java:2725
-#: build/trans_presets.java:2732 build/trans_presets.java:2738
-#: build/trans_presets.java:2744 build/trans_presets.java:2755
-#: build/trans_presets.java:2763 build/trans_presets.java:2778
-#: build/trans_presets.java:2784 build/trans_presets.java:2792
-#: build/trans_presets.java:2819
+#: build/trans_presets.java:1333 build/trans_presets.java:1636
+#: build/trans_presets.java:1644 build/trans_presets.java:1651
+#: build/trans_presets.java:1658 build/trans_presets.java:1664
+#: build/trans_presets.java:1671 build/trans_presets.java:1678
+#: build/trans_presets.java:1693 build/trans_presets.java:1701
+#: build/trans_presets.java:1714 build/trans_presets.java:1728
+#: build/trans_presets.java:1825 build/trans_presets.java:1833
+#: build/trans_presets.java:1936 build/trans_presets.java:1942
+#: build/trans_presets.java:2255 build/trans_presets.java:2279
+#: build/trans_presets.java:2542 build/trans_presets.java:2548
+#: build/trans_presets.java:2555 build/trans_presets.java:2562
+#: build/trans_presets.java:2568 build/trans_presets.java:2574
+#: build/trans_presets.java:2581 build/trans_presets.java:2588
+#: build/trans_presets.java:2595 build/trans_presets.java:2601
+#: build/trans_presets.java:2608 build/trans_presets.java:2614
+#: build/trans_presets.java:2620 build/trans_presets.java:2626
+#: build/trans_presets.java:2632 build/trans_presets.java:2638
+#: build/trans_presets.java:2645 build/trans_presets.java:2652
+#: build/trans_presets.java:2659 build/trans_presets.java:2665
+#: build/trans_presets.java:2671 build/trans_presets.java:2677
+#: build/trans_presets.java:2683 build/trans_presets.java:2689
+#: build/trans_presets.java:2696 build/trans_presets.java:2703
+#: build/trans_presets.java:2710 build/trans_presets.java:2716
+#: build/trans_presets.java:2722 build/trans_presets.java:2748
+#: build/trans_presets.java:2756 build/trans_presets.java:2771
+#: build/trans_presets.java:2777 build/trans_presets.java:2785
+#: build/trans_presets.java:2812
 msgid "Tu-Su 08:00-15:00; Sa 08:00-12:00"
 msgstr ""
 
+#: build/trans_presets.java:1334
+msgid "Fuel types:"
+msgstr ""
+
+#. item "Car/Fuel" label "Fuel types:"
+#: build/trans_presets.java:1335
+msgid "Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel"
+#: build/trans_presets.java:1336
+msgid "Bio Diesel"
+msgstr ""
+
+#. item "Car/Fuel" check "Bio Diesel"
+#: build/trans_presets.java:1337
+msgid "Diesel (Gas To Liquid - ultimate diesel)"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+#: build/trans_presets.java:1338
+msgid "Diesel for Heavy Good Vehicles"
+msgstr ""
+
+#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+#: build/trans_presets.java:1339
+msgid "Octane 91"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 91"
+#: build/trans_presets.java:1340
+msgid "Octane 95"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 95"
 #: build/trans_presets.java:1341
-msgid "Fuel types:"
-msgstr ""
-
-#. item "Car/Fuel" label "Fuel types:"
+msgid "Octane 98"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 98"
 #: build/trans_presets.java:1342
-msgid "Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel"
+msgid "Octane 100"
+msgstr ""
+
+#. item "Car/Fuel" check "Octane 100"
 #: build/trans_presets.java:1343
-msgid "Bio Diesel"
-msgstr ""
-
-#. item "Car/Fuel" check "Bio Diesel"
+msgid "E10 (10% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
 #: build/trans_presets.java:1344
-msgid "Diesel (Gas To Liquid - ultimate diesel)"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel (Gas To Liquid - ultimate diesel)"
+msgid "E85 (85% Ethanol mix)"
+msgstr ""
+
+#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
 #: build/trans_presets.java:1345
-msgid "Diesel for Heavy Good Vehicles"
-msgstr ""
-
-#. item "Car/Fuel" check "Diesel for Heavy Good Vehicles"
+msgid "LPG (Liquefied petroleum gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
 #: build/trans_presets.java:1346
-msgid "Octane 91"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 91"
+msgid "CNG (Compressed Natural Gas)"
+msgstr ""
+
+#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
 #: build/trans_presets.java:1347
-msgid "Octane 95"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 95"
+msgid "1/25 mix (mofa/moped)"
+msgstr ""
+
+#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
 #: build/trans_presets.java:1348
-msgid "Octane 98"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 98"
-#: build/trans_presets.java:1349
-msgid "Octane 100"
-msgstr ""
-
-#. item "Car/Fuel" check "Octane 100"
-#: build/trans_presets.java:1350
-msgid "E10 (10% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E10 (10% Ethanol mix)"
-#: build/trans_presets.java:1351
-msgid "E85 (85% Ethanol mix)"
-msgstr ""
-
-#. item "Car/Fuel" check "E85 (85% Ethanol mix)"
-#: build/trans_presets.java:1352
-msgid "LPG (Liquefied petroleum gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "LPG (Liquefied petroleum gas)"
-#: build/trans_presets.java:1353
-msgid "CNG (Compressed Natural Gas)"
-msgstr ""
-
-#. item "Car/Fuel" check "CNG (Compressed Natural Gas)"
-#: build/trans_presets.java:1354
-msgid "1/25 mix (mofa/moped)"
-msgstr ""
-
-#. item "Car/Fuel" check "1/25 mix (mofa/moped)"
-#: build/trans_presets.java:1355
 msgid "1/50 mix (mofa/moped)"
 msgstr ""
@@ -22799,5 +22736,5 @@
 #. -->
 #. </button>
-#: build/trans_presets.java:1358 build/trans_presets.java:1404
+#: build/trans_presets.java:1351 build/trans_presets.java:1397
 #: build/trans_surveyor.java:24
 msgid "Parking"
@@ -22807,5 +22744,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=parking"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=parking" />
-#: build/trans_presets.java:1361
+#: build/trans_presets.java:1354
 msgid "Edit Parking"
 msgstr "編輯停車場"
@@ -22816,25 +22753,25 @@
 #. item "Amenities/Toilets" text "Operator"
 #. item "Shops/Vending machine" text "Operator"
-#: build/trans_presets.java:1364 build/trans_presets.java:1784
-#: build/trans_presets.java:1794 build/trans_presets.java:2446
-#: build/trans_presets.java:2589
+#: build/trans_presets.java:1357 build/trans_presets.java:1777
+#: build/trans_presets.java:1787 build/trans_presets.java:2439
+#: build/trans_presets.java:2731
 msgid "Reference number"
 msgstr ""
 
 #. item "Car/Parking" combo "Type"
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "multi-storey"
 msgstr "塔式"
 
-#: build/trans_presets.java:1365
+#: build/trans_presets.java:1358
 msgid "surface"
 msgstr "平面式"
 
 #. item "Man Made/Pipeline" combo "Location"
-#: build/trans_presets.java:1365 build/trans_presets.java:2356
+#: build/trans_presets.java:1358 build/trans_presets.java:2349
 msgid "underground"
 msgstr "地下"
 
-#: build/trans_presets.java:1366
+#: build/trans_presets.java:1359
 msgid "Park and Ride"
 msgstr ""
@@ -22843,48 +22780,48 @@
 #. item "Tourism/Audioguide" text "Reference number"
 #. item "Amenities/Toilets" text "Reference number"
-#: build/trans_presets.java:1367 build/trans_presets.java:1785
-#: build/trans_presets.java:1795 build/trans_presets.java:2447
+#: build/trans_presets.java:1360 build/trans_presets.java:1778
+#: build/trans_presets.java:1788 build/trans_presets.java:2440
 msgid "Fee"
 msgstr "費用"
 
 #. <space />
-#: build/trans_presets.java:1369
+#: build/trans_presets.java:1362
 msgid "Capacity (overall)"
 msgstr ""
 
 #. item "Car/Parking" text "Capacity (overall)"
-#: build/trans_presets.java:1370
+#: build/trans_presets.java:1363
 msgid "Spaces for Disabled"
 msgstr "殘障專用空間"
 
-#: build/trans_presets.java:1371
+#: build/trans_presets.java:1364
 msgid "Spaces for Women"
 msgstr ""
 
-#: build/trans_presets.java:1372
+#: build/trans_presets.java:1365
 msgid "Spaces for Parents"
 msgstr ""
 
-#: build/trans_presets.java:1373
+#: build/trans_presets.java:1366
 msgid "See the Wiki for other capacity:[types]=*."
 msgstr ""
 
 #. item "Car/Parking" label "See the Wiki for other capacity:[types]=*."
-#: build/trans_presets.java:1375
+#: build/trans_presets.java:1368
 msgid "Wash"
 msgstr "洗車場"
 
 #. item "Car/Wash"
-#: build/trans_presets.java:1376
+#: build/trans_presets.java:1369
 msgid "Edit Car Wash"
 msgstr "編輯"
 
 #. item "Car/Wash" text "Operator"
-#: build/trans_presets.java:1381
+#: build/trans_presets.java:1374
 msgid "Repair"
 msgstr "修車場"
 
 #. item "Car/Repair"
-#: build/trans_presets.java:1382
+#: build/trans_presets.java:1375
 msgid "Edit Car Repair"
 msgstr "編輯修車場"
@@ -22892,5 +22829,5 @@
 #. item "Car/Repair" text "Operator"
 #. item "Bicycle/Parking" text "Capacity"
-#: build/trans_presets.java:1387 build/trans_presets.java:1411
+#: build/trans_presets.java:1380 build/trans_presets.java:1404
 msgid "Rental"
 msgstr "租車"
@@ -22899,10 +22836,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_rental"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=car_rental"  />
-#: build/trans_presets.java:1390
+#: build/trans_presets.java:1383
 msgid "Edit Car Rental"
 msgstr "編輯租車"
 
 #. item "Car/Rental" text "Operator"
-#: build/trans_presets.java:1395
+#: build/trans_presets.java:1388
 msgid "Sharing"
 msgstr ""
@@ -22910,5 +22847,5 @@
 #. item "Car/Sharing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=car_sharing" />
-#: build/trans_presets.java:1397
+#: build/trans_presets.java:1390
 msgid "Edit Car Sharing"
 msgstr ""
@@ -22916,10 +22853,10 @@
 #. item "Bicycle/Parking"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_parking" />
-#: build/trans_presets.java:1406
+#: build/trans_presets.java:1399
 msgid "Edit Bicycle Parking"
 msgstr "編輯自行車停車場"
 
 #. item "Bicycle/Parking" text "Name"
-#: build/trans_presets.java:1409
+#: build/trans_presets.java:1402
 msgid "Capacity"
 msgstr "容量"
@@ -22928,10 +22865,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bicycle_rental"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:bicycle_rental" />
-#: build/trans_presets.java:1414
+#: build/trans_presets.java:1407
 msgid "Edit Bicycle Rental"
 msgstr "編輯自行車租用點"
 
 #. group "Public Transport"
-#: build/trans_presets.java:1420
+#: build/trans_presets.java:1413
 msgctxt "railway"
 msgid "Station"
@@ -22941,5 +22878,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=station" />
-#: build/trans_presets.java:1423
+#: build/trans_presets.java:1416
 msgctxt "railway"
 msgid "Edit Station"
@@ -22947,5 +22884,5 @@
 
 #. item "Public Transport/Station" text "Name"
-#: build/trans_presets.java:1428
+#: build/trans_presets.java:1421
 msgid "UIC-Reference"
 msgstr ""
@@ -22953,5 +22890,5 @@
 #. item "Public Transport/Station" text "UIC-Reference"
 #. </optional>
-#: build/trans_presets.java:1431
+#: build/trans_presets.java:1424
 msgid "Railway Halt"
 msgstr ""
@@ -22959,5 +22896,5 @@
 #. item "Public Transport/Railway Halt"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=halt" />
-#: build/trans_presets.java:1433
+#: build/trans_presets.java:1426
 msgid "Edit Halt"
 msgstr ""
@@ -22965,5 +22902,5 @@
 #. item "Public Transport/Railway Halt" text "Name"
 #. </optional>
-#: build/trans_presets.java:1440
+#: build/trans_presets.java:1433
 msgid "Tram Stop"
 msgstr "路面電車停靠"
@@ -22972,5 +22909,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=tram_stop"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=tram_stop" />
-#: build/trans_presets.java:1443
+#: build/trans_presets.java:1436
 msgid "Edit Tram Stop"
 msgstr "編輯路面電車停靠"
@@ -22978,5 +22915,5 @@
 #. item "Public Transport/Tram Stop" text "Name"
 #. </optional>
-#: build/trans_presets.java:1450
+#: build/trans_presets.java:1443
 msgid "Railway Platform"
 msgstr "鐵路月台"
@@ -22985,5 +22922,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=platform"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:railway=platform" />
-#: build/trans_presets.java:1453
+#: build/trans_presets.java:1446
 msgid "Edit Railway Platform"
 msgstr "編輯鐵路月台"
@@ -22995,5 +22932,5 @@
 #. <key key="highway" value="platform" />
 #. <space />
-#: build/trans_presets.java:1456 build/trans_presets.java:1501
+#: build/trans_presets.java:1449 build/trans_presets.java:1494
 msgid "Reference (track number)"
 msgstr ""
@@ -23001,10 +22938,10 @@
 #. item "Public Transport/Railway Platform" text "Width (meters)"
 #. item "Public Transport/Bus Platform" text "Width (meters)"
-#: build/trans_presets.java:1458 build/trans_presets.java:1503
+#: build/trans_presets.java:1451 build/trans_presets.java:1496
 msgid "Area"
 msgstr "區域"
 
 #. item "Public Transport/Railway Platform" check "Area"
-#: build/trans_presets.java:1460
+#: build/trans_presets.java:1453
 msgid "Subway Entrance"
 msgstr "地下鐵入口"
@@ -23013,10 +22950,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:railway=subway_entrance"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:railway=subway_entrance" />
-#: build/trans_presets.java:1463
+#: build/trans_presets.java:1456
 msgid "Edit Subway Entrance"
 msgstr "編輯地下鐵入口"
 
 #. item "Public Transport/Subway Entrance" text "Name"
-#: build/trans_presets.java:1468 build/trans_presets.java:2448
+#: build/trans_presets.java:1461 build/trans_presets.java:2441
 msgid "Wheelchair"
 msgstr ""
@@ -23025,5 +22962,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1473
+#: build/trans_presets.java:1466
 msgid "Bus Station"
 msgstr "公車車站"
@@ -23032,5 +22969,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bus_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=bus_station" />
-#: build/trans_presets.java:1476
+#: build/trans_presets.java:1469
 msgid "Edit Bus Station"
 msgstr "編輯公車車站"
@@ -23038,5 +22975,5 @@
 #. item "Public Transport/Bus Station" text "Name"
 #. </optional>
-#: build/trans_presets.java:1482
+#: build/trans_presets.java:1475
 msgid "Bus Stop"
 msgstr "公車站牌"
@@ -23046,5 +22983,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=bus_stop"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:highway=bus_stop" />
-#: build/trans_presets.java:1486
+#: build/trans_presets.java:1479
 msgid "Edit Bus Stop"
 msgstr "編輯公車站牌"
@@ -23053,6 +22990,6 @@
 #. item "Tourism/Other Information Points" text "Closer Description"
 #. <separator/>
-#: build/trans_presets.java:1491 build/trans_presets.java:1807
-#: build/trans_presets.java:2498
+#: build/trans_presets.java:1484 build/trans_presets.java:1800
+#: build/trans_presets.java:2491
 msgid "Shelter"
 msgstr ""
@@ -23060,19 +22997,19 @@
 #. item "Amenities/Waste Basket" label "Edit Waste Basket"
 #. <key key="amenity" value="waste_basket" />
-#: build/trans_presets.java:1492 build/trans_presets.java:2486
+#: build/trans_presets.java:1485 build/trans_presets.java:2479
 msgid "Bench"
 msgstr "長椅"
 
-#: build/trans_presets.java:1493
+#: build/trans_presets.java:1486
 msgid "Tactile Paving"
 msgstr ""
 
 #. </optional>
-#: build/trans_presets.java:1497
+#: build/trans_presets.java:1490
 msgid "Bus Platform"
 msgstr "公車月台"
 
 #. item "Public Transport/Bus Platform"
-#: build/trans_presets.java:1498
+#: build/trans_presets.java:1491
 msgid "Edit Bus Platform"
 msgstr "編輯公車月台"
@@ -23080,5 +23017,5 @@
 #. item "Public Transport/Bus Platform" check "Area"
 #. <separator/>
-#: build/trans_presets.java:1506
+#: build/trans_presets.java:1499
 msgid "Taxi"
 msgstr "計程車"
@@ -23086,5 +23023,5 @@
 #. item "Public Transport/Taxi"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=taxi" />
-#: build/trans_presets.java:1508
+#: build/trans_presets.java:1501
 msgid "Edit Taxi station"
 msgstr "編輯計程車招呼站"
@@ -23092,10 +23029,10 @@
 #. item "Public Transport/Taxi" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1514
+#: build/trans_presets.java:1507
 msgid "Airport"
 msgstr "機場"
 
 #. group "Airport"
-#: build/trans_presets.java:1515
+#: build/trans_presets.java:1508
 msgid "Airport Ground"
 msgstr ""
@@ -23103,5 +23040,5 @@
 #. item "Airport/Airport Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=aerodrome" />
-#: build/trans_presets.java:1517
+#: build/trans_presets.java:1510
 msgid "Edit Airport Ground"
 msgstr ""
@@ -23109,10 +23046,10 @@
 #. item "Airport/Airport Ground" text "Name"
 #. <optional>
-#: build/trans_presets.java:1521
+#: build/trans_presets.java:1514
 msgid "IATA"
 msgstr ""
 
 #. item "Airport/Airport Ground" text "IATA"
-#: build/trans_presets.java:1522
+#: build/trans_presets.java:1515
 msgid "ICAO"
 msgstr ""
@@ -23121,5 +23058,5 @@
 #. </optional>
 #. <separator/>
-#: build/trans_presets.java:1526
+#: build/trans_presets.java:1519
 msgid "Runway"
 msgstr ""
@@ -23127,5 +23064,5 @@
 #. item "Airport/Runway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=runway" />
-#: build/trans_presets.java:1528
+#: build/trans_presets.java:1521
 msgid "Edit Runway"
 msgstr ""
@@ -23133,5 +23070,5 @@
 #. item "Airport/Runway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1534
+#: build/trans_presets.java:1527
 msgid "Taxiway"
 msgstr ""
@@ -23139,5 +23076,5 @@
 #. item "Airport/Taxiway"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=taxiway" />
-#: build/trans_presets.java:1536
+#: build/trans_presets.java:1529
 msgid "Edit Taxiway"
 msgstr ""
@@ -23145,5 +23082,5 @@
 #. item "Airport/Taxiway" text "Reference"
 #. </optional>
-#: build/trans_presets.java:1542
+#: build/trans_presets.java:1535
 msgid "Helipad"
 msgstr ""
@@ -23151,5 +23088,5 @@
 #. item "Airport/Helipad"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=helipad" />
-#: build/trans_presets.java:1544
+#: build/trans_presets.java:1537
 msgid "Edit Helipad"
 msgstr ""
@@ -23159,5 +23096,5 @@
 #. item "Airport/Apron"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=apron" />
-#: build/trans_presets.java:1550 build/trans_presets.java:1552
+#: build/trans_presets.java:1543 build/trans_presets.java:1545
 msgid "Apron"
 msgstr ""
@@ -23167,5 +23104,5 @@
 #. item "Airport/Hangar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=hangar" />
-#: build/trans_presets.java:1555 build/trans_presets.java:1557
+#: build/trans_presets.java:1548 build/trans_presets.java:1550
 msgid "Hangar"
 msgstr ""
@@ -23176,6 +23113,6 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made%3Dbeacon" />
 #. item "Man Made/Crane" text "Name"
-#: build/trans_presets.java:1560 build/trans_presets.java:1562
-#: build/trans_presets.java:2372
+#: build/trans_presets.java:1553 build/trans_presets.java:1555
+#: build/trans_presets.java:2365
 msgid "Beacon"
 msgstr ""
@@ -23185,5 +23122,5 @@
 #. item "Airport/Windsock"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=windsock" />
-#: build/trans_presets.java:1565 build/trans_presets.java:1567
+#: build/trans_presets.java:1558 build/trans_presets.java:1560
 msgid "Windsock"
 msgstr ""
@@ -23192,5 +23129,5 @@
 #. <key key="aeroway" value="windsock" />
 #. <separator/>
-#: build/trans_presets.java:1571
+#: build/trans_presets.java:1564
 msgid "Terminal"
 msgstr ""
@@ -23198,5 +23135,5 @@
 #. item "Airport/Terminal"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=terminal" />
-#: build/trans_presets.java:1573
+#: build/trans_presets.java:1566
 msgid "Edit Terminal"
 msgstr ""
@@ -23204,15 +23141,15 @@
 #. item "Airport/Gate"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:aeroway=gate" />
-#: build/trans_presets.java:1579
+#: build/trans_presets.java:1572
 msgid "Edit Terminal Gate"
 msgstr ""
 
 #. item "Airport/Gate" text "Reference"
-#: build/trans_presets.java:1585
+#: build/trans_presets.java:1578
 msgid "Travel"
 msgstr "旅遊"
 
 #. group "Travel"
-#: build/trans_presets.java:1586
+#: build/trans_presets.java:1579
 msgid "Accomodation"
 msgstr "住宿"
@@ -23224,5 +23161,5 @@
 #. <action class="SetWaypointAction" params="Fuel"/>
 #. </button>
-#: build/trans_presets.java:1587 build/trans_surveyor.java:43
+#: build/trans_presets.java:1580 build/trans_surveyor.java:43
 msgid "Hotel"
 msgstr "旅館"
@@ -23231,15 +23168,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hotel"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=hotel" />
-#: build/trans_presets.java:1590
+#: build/trans_presets.java:1583
 msgid "Edit Hotel"
 msgstr "編輯旅館"
 
 #. item "Travel/Accomodation/Hotel" text "Name"
-#: build/trans_presets.java:1593
+#: build/trans_presets.java:1586
 msgid "Stars"
 msgstr "星級"
 
 #. item "Travel/Accomodation/Hotel" combo "Stars"
-#: build/trans_presets.java:1595
+#: build/trans_presets.java:1588
 msgid "Motel"
 msgstr "汽車旅館"
@@ -23247,20 +23184,20 @@
 #. item "Travel/Accomodation/Motel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=motel" />
-#: build/trans_presets.java:1597
+#: build/trans_presets.java:1590
 msgid "Edit Motel"
 msgstr "編輯汽車旅館"
 
 #. item "Travel/Accomodation/Motel" text "Name"
-#: build/trans_presets.java:1601
+#: build/trans_presets.java:1594
 msgid "Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House"
-#: build/trans_presets.java:1602
+#: build/trans_presets.java:1595
 msgid "Edit Guest House"
 msgstr ""
 
 #. item "Travel/Accomodation/Guest House" text "Name"
-#: build/trans_presets.java:1606
+#: build/trans_presets.java:1599
 msgid "Chalet"
 msgstr ""
@@ -23268,10 +23205,10 @@
 #. item "Travel/Accomodation/Chalet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=chalet" />
-#: build/trans_presets.java:1608
+#: build/trans_presets.java:1601
 msgid "Edit Chalet"
 msgstr ""
 
 #. item "Travel/Accomodation/Chalet" text "Name"
-#: build/trans_presets.java:1612
+#: build/trans_presets.java:1605
 msgid "Hostel"
 msgstr ""
@@ -23279,30 +23216,30 @@
 #. item "Travel/Accomodation/Hostel"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=hostel" />
-#: build/trans_presets.java:1614
+#: build/trans_presets.java:1607
 msgid "Edit Hostel"
 msgstr ""
 
 #. item "Travel/Accomodation/Hostel" text "Name"
+#: build/trans_presets.java:1611
+msgid "Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut"
+#: build/trans_presets.java:1612
+msgid "Edit Alpine Hut"
+msgstr ""
+
+#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
+#: build/trans_presets.java:1617
+msgid "Caravan Site"
+msgstr ""
+
+#. item "Travel/Accomodation/Caravan Site"
 #: build/trans_presets.java:1618
-msgid "Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut"
-#: build/trans_presets.java:1619
-msgid "Edit Alpine Hut"
-msgstr ""
-
-#. item "Travel/Accomodation/Alpine Hut" text "Elevation"
-#: build/trans_presets.java:1624
-msgid "Caravan Site"
-msgstr ""
-
-#. item "Travel/Accomodation/Caravan Site"
-#: build/trans_presets.java:1625
 msgid "Edit Caravan Site"
 msgstr ""
 
 #. item "Travel/Accomodation/Caravan Site" text "Name"
-#: build/trans_presets.java:1629
+#: build/trans_presets.java:1622
 msgid "Camping Site"
 msgstr "露營區"
@@ -23310,10 +23247,10 @@
 #. item "Travel/Accomodation/Camping Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=camp_site" />
-#: build/trans_presets.java:1631
+#: build/trans_presets.java:1624
 msgid "Edit Camping Site"
 msgstr "編輯露營區"
 
 #. item "Travel/Accomodation/Camping Site" text "Name"
-#: build/trans_presets.java:1636
+#: build/trans_presets.java:1629
 msgid "Food+Drinks"
 msgstr "食物+飲料"
@@ -23324,5 +23261,5 @@
 #. <action class="SetWaypointAction" params="Hotel"/>
 #. </button>
-#: build/trans_presets.java:1637 build/trans_surveyor.java:47
+#: build/trans_presets.java:1630 build/trans_surveyor.java:47
 msgid "Restaurant"
 msgstr "餐廳"
@@ -23330,5 +23267,5 @@
 #. item "Food+Drinks/Restaurant"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=restaurant" />
-#: build/trans_presets.java:1639
+#: build/trans_presets.java:1632
 msgid "Edit Restaurant"
 msgstr "編輯餐廳"
@@ -23336,5 +23273,5 @@
 #. item "Food+Drinks/Restaurant" text "Name"
 #. item "Food+Drinks/Fast Food" text "Name"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "Cuisine"
 msgstr "烹調風格"
@@ -23342,73 +23279,73 @@
 #. item "Food+Drinks/Restaurant" combo "Cuisine"
 #. item "Food+Drinks/Fast Food" combo "Cuisine"
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "italian"
 msgstr "意大利文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "chinese"
 msgstr "中文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "pizza"
 msgstr "披薩"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "burger"
 msgstr "漢堡"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "greek"
 msgstr "希臘文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "german"
 msgstr "德文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "indian"
 msgstr "印度料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "regional"
 msgstr "地方料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "kebab"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "turkish"
 msgstr "土耳其料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "asian"
 msgstr "亞洲料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "thai"
 msgstr "泰文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "mexican"
 msgstr "墨西哥料理"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "japanese"
 msgstr "日文"
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "french"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sandwich"
 msgstr ""
 
-#: build/trans_presets.java:1642 build/trans_presets.java:1650
+#: build/trans_presets.java:1635 build/trans_presets.java:1643
 msgid "sushi"
 msgstr ""
 
-#: build/trans_presets.java:1645
+#: build/trans_presets.java:1638
 msgid "Fast Food"
 msgstr "速食"
@@ -23416,17 +23353,17 @@
 #. item "Food+Drinks/Fast Food"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fast_food" />
-#: build/trans_presets.java:1647
+#: build/trans_presets.java:1640
 msgid "Edit Fast Food Restaurant"
 msgstr "編輯速食餐廳"
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "fish_and_chips"
 msgstr ""
 
-#: build/trans_presets.java:1650
+#: build/trans_presets.java:1643
 msgid "chicken"
 msgstr ""
 
-#: build/trans_presets.java:1653
+#: build/trans_presets.java:1646
 msgid "Cafe"
 msgstr "咖啡"
@@ -23434,9 +23371,9 @@
 #. item "Food+Drinks/Cafe"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cafe" />
-#: build/trans_presets.java:1655
+#: build/trans_presets.java:1648
 msgid "Edit Cafe"
 msgstr "編輯咖啡廳"
 
-#: build/trans_presets.java:1660
+#: build/trans_presets.java:1653
 msgid "Pub"
 msgstr "酒店"
@@ -23444,18 +23381,18 @@
 #. item "Food+Drinks/Pub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pub" />
-#: build/trans_presets.java:1662
+#: build/trans_presets.java:1655
 msgid "Edit Pub"
 msgstr "編輯酒店"
 
-#: build/trans_presets.java:1667
+#: build/trans_presets.java:1660
 msgid "Biergarten"
 msgstr ""
 
 #. item "Food+Drinks/Biergarten"
-#: build/trans_presets.java:1668
+#: build/trans_presets.java:1661
 msgid "Edit Biergarten"
 msgstr ""
 
-#: build/trans_presets.java:1673
+#: build/trans_presets.java:1666
 msgid "Bar"
 msgstr "酒吧"
@@ -23463,9 +23400,9 @@
 #. item "Food+Drinks/Bar"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bar" />
-#: build/trans_presets.java:1675
+#: build/trans_presets.java:1668
 msgid "Edit Bar"
 msgstr "編輯酒吧"
 
-#: build/trans_presets.java:1680
+#: build/trans_presets.java:1673
 msgid "Nightclub"
 msgstr "夜店"
@@ -23473,24 +23410,24 @@
 #. item "Food+Drinks/Nightclub"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=nightclub" />
-#: build/trans_presets.java:1682
+#: build/trans_presets.java:1675
 msgid "Edit Nightclub"
 msgstr "編輯夜店"
 
-#: build/trans_presets.java:1688
+#: build/trans_presets.java:1681
 msgid "Tourism"
 msgstr "旅遊相關"
 
 #. group "Tourism"
-#: build/trans_presets.java:1689
+#: build/trans_presets.java:1682
 msgid "Attraction"
 msgstr "吸引力點"
 
 #. item "Tourism/Attraction"
-#: build/trans_presets.java:1690
+#: build/trans_presets.java:1683
 msgid "Edit Attraction"
 msgstr "編輯吸引力點"
 
 #. item "Tourism/Attraction" text "Opening Hours"
-#: build/trans_presets.java:1695
+#: build/trans_presets.java:1688
 msgid "Museum"
 msgstr "博物館"
@@ -23498,9 +23435,9 @@
 #. item "Tourism/Museum"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=museum" />
-#: build/trans_presets.java:1697
+#: build/trans_presets.java:1690
 msgid "Edit Museum"
 msgstr "編輯博物館"
 
-#: build/trans_presets.java:1702
+#: build/trans_presets.java:1695
 msgid "Zoo"
 msgstr "動物園"
@@ -23509,9 +23446,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=zoo"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:tourism=zook" />
-#: build/trans_presets.java:1705
+#: build/trans_presets.java:1698
 msgid "Edit Zoo"
 msgstr "編輯動物園"
 
-#: build/trans_presets.java:1710
+#: build/trans_presets.java:1703
 msgid "Viewpoint"
 msgstr "景點"
@@ -23519,24 +23456,24 @@
 #. item "Tourism/Viewpoint"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=viewpoint" />
-#: build/trans_presets.java:1712
+#: build/trans_presets.java:1705
 msgid "Edit Viewpoint"
 msgstr "編輯景點"
 
 #. item "Tourism/Viewpoint" text "Name"
-#: build/trans_presets.java:1715
+#: build/trans_presets.java:1708
 msgid "Look-Out Tower"
 msgstr ""
 
 #. item "Tourism/Viewpoint" check "Look-Out Tower"
-#: build/trans_presets.java:1717
+#: build/trans_presets.java:1710
 msgid "Theme Park"
 msgstr "主題樂園"
 
 #. item "Tourism/Theme Park"
-#: build/trans_presets.java:1718
+#: build/trans_presets.java:1711
 msgid "Edit Theme Park"
 msgstr "編輯主題樂園"
 
-#: build/trans_presets.java:1723
+#: build/trans_presets.java:1716
 msgid "Artwork"
 msgstr "藝術工作"
@@ -23544,5 +23481,5 @@
 #. item "Tourism/Artwork"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:tourism=artwork" />
-#: build/trans_presets.java:1725
+#: build/trans_presets.java:1718
 msgid "Edit Artwork"
 msgstr "編輯藝術工作"
@@ -23550,19 +23487,19 @@
 #. item "Tourism/Artwork" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1730
+#: build/trans_presets.java:1723
 msgid "Information Office"
 msgstr "資訊服務處"
 
-#: build/trans_presets.java:1737
+#: build/trans_presets.java:1730
 msgid "Map"
 msgstr "地圖"
 
 #. item "Tourism/Map" text "Name"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "Detail Grade"
 msgstr ""
 
 #. item "Tourism/Map" combo "Detail Grade"
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "topo"
 msgstr ""
@@ -23600,5 +23537,5 @@
 #. <rule>
 #. <condition k="highway" v="living_street"/>
-#: build/trans_presets.java:1742 build/trans_style.java:625
+#: build/trans_presets.java:1735 build/trans_style.java:625
 #: build/trans_style.java:641 build/trans_style.java:657
 #: build/trans_style.java:665
@@ -23606,28 +23543,28 @@
 msgstr "街"
 
-#: build/trans_presets.java:1742
+#: build/trans_presets.java:1735
 msgid "scheme"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "Shown Area"
 msgstr ""
 
 #. item "Tourism/Map" combo "Shown Area"
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "site"
 msgstr ""
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "city"
 msgstr "城市"
 
-#: build/trans_presets.java:1743
+#: build/trans_presets.java:1736
 msgid "region"
 msgstr ""
 
 #. item "Tourism/Other Information Points" text "Name"
-#: build/trans_presets.java:1744 build/trans_presets.java:1760
-#: build/trans_presets.java:1804
+#: build/trans_presets.java:1737 build/trans_presets.java:1753
+#: build/trans_presets.java:1797
 msgid "Closer Description"
 msgstr ""
@@ -23637,5 +23574,5 @@
 #. item "Tourism/Guidepost" text "Elevation"
 #. <space />
-#: build/trans_presets.java:1746 build/trans_presets.java:1769
+#: build/trans_presets.java:1739 build/trans_presets.java:1762
 msgid "Routes shown for:"
 msgstr ""
@@ -23643,5 +23580,5 @@
 #. item "Tourism/Map" label "Routes shown for:"
 #. item "Tourism/Guidepost" label "Routes shown for:"
-#: build/trans_presets.java:1747 build/trans_presets.java:1770
+#: build/trans_presets.java:1740 build/trans_presets.java:1763
 msgid "Hiking"
 msgstr "健走"
@@ -23649,6 +23586,6 @@
 #. item "Tourism/Map" check "Hiking"
 #. item "Tourism/Guidepost" check "Hiking"
-#: build/trans_presets.java:1748 build/trans_presets.java:1771
-#: build/trans_presets.java:1989
+#: build/trans_presets.java:1741 build/trans_presets.java:1764
+#: build/trans_presets.java:1982
 msgid "Cycling"
 msgstr "自行車"
@@ -23656,5 +23593,5 @@
 #. item "Tourism/Map" check "Cycling"
 #. item "Tourism/Guidepost" check "Cycling"
-#: build/trans_presets.java:1749 build/trans_presets.java:1772
+#: build/trans_presets.java:1742 build/trans_presets.java:1765
 msgid "Mountainbiking"
 msgstr ""
@@ -23662,6 +23599,6 @@
 #. item "Tourism/Map" check "Mountainbiking"
 #. item "Tourism/Guidepost" check "Mountainbiking"
-#: build/trans_presets.java:1750 build/trans_presets.java:1773
-#: build/trans_presets.java:2043
+#: build/trans_presets.java:1743 build/trans_presets.java:1766
+#: build/trans_presets.java:2036
 msgid "Skiing"
 msgstr "滑雪"
@@ -23669,5 +23606,5 @@
 #. item "Tourism/Map" check "Skiing"
 #. item "Tourism/Guidepost" check "Skiing"
-#: build/trans_presets.java:1751 build/trans_presets.java:1774
+#: build/trans_presets.java:1744 build/trans_presets.java:1767
 msgid "Riding"
 msgstr ""
@@ -23675,46 +23612,46 @@
 #. item "Tourism/Map" check "Riding"
 #. item "Tourism/Guidepost" check "Riding"
-#: build/trans_presets.java:1752 build/trans_presets.java:1775
+#: build/trans_presets.java:1745 build/trans_presets.java:1768
 msgid "... other transportation modes possible"
 msgstr ""
 
 #. item "Tourism/Map" label "... other transportation modes possible"
-#: build/trans_presets.java:1754
+#: build/trans_presets.java:1747
 msgid "Information Board"
 msgstr "資訊板"
 
 #. item "Tourism/Information Board" text "Name"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "Board Content"
 msgstr ""
 
 #. item "Tourism/Information Board" combo "Board Content"
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "notice"
 msgstr ""
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "history"
 msgstr "歷史"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "nature"
 msgstr "自然"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "wildlife"
 msgstr "野生"
 
-#: build/trans_presets.java:1759
+#: build/trans_presets.java:1752
 msgid "plants"
 msgstr ""
 
 #. item "Tourism/Information Board" text "Closer Description"
-#: build/trans_presets.java:1762
+#: build/trans_presets.java:1755
 msgid "Guidepost"
 msgstr ""
 
 #. item "Tourism/Guidepost" label "... other transportation modes possible"
-#: build/trans_presets.java:1777
+#: build/trans_presets.java:1770
 msgid "Information Terminal"
 msgstr ""
@@ -23722,29 +23659,29 @@
 #. item "Tourism/Information Terminal" text "Name"
 #. item "Tourism/Audioguide" text "Name"
-#: build/trans_presets.java:1782 build/trans_presets.java:1792
+#: build/trans_presets.java:1775 build/trans_presets.java:1785
 msgid "Closer description"
 msgstr ""
 
-#: build/trans_presets.java:1787
+#: build/trans_presets.java:1780
 msgid "Audioguide"
 msgstr ""
 
 #. <space />
-#: build/trans_presets.java:1797
+#: build/trans_presets.java:1790
 msgid "Audioguide via mobile phone?"
 msgstr ""
 
 #. item "Tourism/Audioguide" label "Audioguide via mobile phone?"
-#: build/trans_presets.java:1798
+#: build/trans_presets.java:1791
 msgid "Phone number"
 msgstr "電話號碼"
 
 #. item "Tourism/Audioguide" text "Phone number"
-#: build/trans_presets.java:1800
+#: build/trans_presets.java:1793
 msgid "Other Information Points"
 msgstr "其他的資訊點"
 
 #. item "Tourism/Shelter"
-#: build/trans_presets.java:1808
+#: build/trans_presets.java:1801
 msgid "Edit Shelter"
 msgstr ""
@@ -23752,25 +23689,25 @@
 #. item "Tourism/Shelter" text "Name"
 #. item "Tourism/Picnic Site" text "Name"
-#: build/trans_presets.java:1811 build/trans_presets.java:1817
+#: build/trans_presets.java:1804 build/trans_presets.java:1810
 msgid "Fireplace"
 msgstr ""
 
 #. item "Tourism/Shelter" check "Fireplace"
-#: build/trans_presets.java:1813
+#: build/trans_presets.java:1806
 msgid "Picnic Site"
 msgstr "野餐區"
 
 #. item "Tourism/Picnic Site"
-#: build/trans_presets.java:1814
+#: build/trans_presets.java:1807
 msgid "Edit Picnic Site"
 msgstr "編輯野餐區"
 
 #. item "Tourism/Picnic Site" check "Fireplace"
-#: build/trans_presets.java:1820
+#: build/trans_presets.java:1813
 msgid "Historic Places"
 msgstr "歷史地區"
 
 #. group "Historic Places"
-#: build/trans_presets.java:1821
+#: build/trans_presets.java:1814
 msgid "Castle"
 msgstr "城堡"
@@ -23779,19 +23716,19 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=castle"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=castle" />
-#: build/trans_presets.java:1824
+#: build/trans_presets.java:1817
 msgid "Edit Castle"
 msgstr "編輯城堡"
 
 #. item "Historic Places/Castle" text "Name"
-#: build/trans_presets.java:1828
+#: build/trans_presets.java:1821
 msgid "Ruins"
 msgstr "遺跡"
 
 #. item "Historic Places/Ruins"
-#: build/trans_presets.java:1829
+#: build/trans_presets.java:1822
 msgid "Edit Ruins"
 msgstr "編輯遺跡"
 
-#: build/trans_presets.java:1834
+#: build/trans_presets.java:1827
 msgid "Archaeological Site"
 msgstr "考古學地區"
@@ -23800,9 +23737,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=archaeological_site"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:historic=archaeological_site" />
-#: build/trans_presets.java:1837
+#: build/trans_presets.java:1830
 msgid "Edit Archaeological Site"
 msgstr "編輯考古學地區"
 
-#: build/trans_presets.java:1842
+#: build/trans_presets.java:1835
 msgid "Battlefield"
 msgstr "戰場"
@@ -23810,10 +23747,10 @@
 #. item "Historic Places/Battlefield"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=battlefield" />
-#: build/trans_presets.java:1844
+#: build/trans_presets.java:1837
 msgid "Edit Battlefield"
 msgstr "編輯戰場"
 
 #. item "Historic Places/Battlefield" text "Name"
-#: build/trans_presets.java:1848
+#: build/trans_presets.java:1841
 msgid "Palaeontological Site"
 msgstr ""
@@ -23821,5 +23758,5 @@
 #. item "Historic Places/Palaeontological Site"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:geological" />
-#: build/trans_presets.java:1850
+#: build/trans_presets.java:1843
 msgid "Edit Palaeontological Site"
 msgstr ""
@@ -23827,15 +23764,15 @@
 #. item "Historic Places/Palaeontological Site" text "Name"
 #. <separator/>
-#: build/trans_presets.java:1855
+#: build/trans_presets.java:1848
 msgid "Monument"
 msgstr "紀念建築"
 
 #. item "Historic Places/Monument"
-#: build/trans_presets.java:1856
+#: build/trans_presets.java:1849
 msgid "Edit Monument"
 msgstr "編輯紀念建築"
 
 #. item "Historic Places/Monument" text "Name"
-#: build/trans_presets.java:1860
+#: build/trans_presets.java:1853
 msgid "Memorial"
 msgstr "紀念碑"
@@ -23843,55 +23780,55 @@
 #. item "Historic Places/Memorial"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:historic=memorial" />
-#: build/trans_presets.java:1862
+#: build/trans_presets.java:1855
 msgid "Edit Memorial"
 msgstr "編輯紀念碑"
 
 #. item "Historic Places/Memorial" text "Name"
-#: build/trans_presets.java:1866
+#: build/trans_presets.java:1859
 msgid "Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross"
-#: build/trans_presets.java:1867
+#: build/trans_presets.java:1860
 msgid "Edit Wayside Cross"
 msgstr ""
 
 #. item "Historic Places/Wayside Cross" text "Name"
-#: build/trans_presets.java:1871
+#: build/trans_presets.java:1864
 msgid "Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine"
-#: build/trans_presets.java:1872
+#: build/trans_presets.java:1865
 msgid "Edit Wayside Shrine"
 msgstr ""
 
 #. item "Historic Places/Wayside Shrine" text "Name"
-#: build/trans_presets.java:1876
+#: build/trans_presets.java:1869
 msgid "Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone"
-#: build/trans_presets.java:1877
+#: build/trans_presets.java:1870
 msgid "Edit Boundary Stone"
 msgstr ""
 
 #. item "Historic Places/Boundary Stone" text "Name"
-#: build/trans_presets.java:1882
+#: build/trans_presets.java:1875
 msgid "Leisure"
 msgstr "休閒"
 
 #. group "Leisure"
-#: build/trans_presets.java:1883
+#: build/trans_presets.java:1876
 msgid "Water Park"
 msgstr "水上樂園"
 
 #. item "Leisure/Water Park"
-#: build/trans_presets.java:1884
+#: build/trans_presets.java:1877
 msgid "Edit Water Park"
 msgstr "編輯水上樂園"
 
 #. item "Leisure/Water Park" text "Name"
-#: build/trans_presets.java:1888
+#: build/trans_presets.java:1881
 msgid "Playground"
 msgstr "運動場"
@@ -23899,35 +23836,35 @@
 #. item "Leisure/Playground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=playground" />
-#: build/trans_presets.java:1890
+#: build/trans_presets.java:1883
 msgid "Edit Playground"
 msgstr "編輯運動場"
 
 #. item "Leisure/Playground" text "Name"
-#: build/trans_presets.java:1894
+#: build/trans_presets.java:1887
 msgid "Fishing"
 msgstr "釣魚"
 
 #. item "Leisure/Fishing"
-#: build/trans_presets.java:1895
+#: build/trans_presets.java:1888
 msgid "Edit Fishing"
 msgstr "編輯釣魚場"
 
 #. item "Leisure/Fishing" text "Name"
-#: build/trans_presets.java:1901 build/trans_presets.java:2734
+#: build/trans_presets.java:1894 build/trans_presets.java:2712
 msgid "Sports"
 msgstr "運動用品"
 
 #. group "Sports"
-#: build/trans_presets.java:1902
+#: build/trans_presets.java:1895
 msgid "Sport Facilities"
 msgstr "運動設施"
 
 #. group "Sports/Sport Facilities"
-#: build/trans_presets.java:1903
+#: build/trans_presets.java:1896
 msgid "Stadium"
 msgstr "競技場"
 
 #. item "Sports/Sport Facilities/Stadium"
-#: build/trans_presets.java:1904
+#: build/trans_presets.java:1897
 msgid "Edit Stadium"
 msgstr "編輯競技揚"
@@ -23941,6 +23878,6 @@
 #. item "Sports/Sport Facilities/Racetrack" text "Name"
 #. <space />
-#: build/trans_presets.java:1908 build/trans_presets.java:1917
-#: build/trans_presets.java:1926 build/trans_presets.java:1935
+#: build/trans_presets.java:1901 build/trans_presets.java:1910
+#: build/trans_presets.java:1919 build/trans_presets.java:1928
 msgid "select sport:"
 msgstr "選擇運動："
@@ -24332,6 +24269,6 @@
 #. <rule>
 #. <condition k="sport" v="fishing"/>
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 #: build/trans_style.java:3705 build/trans_style.java:3713
 #: build/trans_style.java:3721 build/trans_style.java:3729
@@ -24365,225 +24302,225 @@
 #. item "Sports/Sport Facilities/Pitch" combo "sport"
 #. item "Sports/Sport Facilities/Racetrack" combo "sport"
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "multi"
 msgstr "多種"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "archery"
 msgstr "射箭"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "athletics"
 msgstr "田徑"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "australian_football"
 msgstr "澳洲足球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "baseball"
 msgstr "棒球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "basketball"
 msgstr "籃球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "boules"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "bowls"
 msgstr "保齡球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "canoe"
 msgstr "獨木舟"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "climbing"
 msgstr "攀岩"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cricket_nets"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "croquet"
 msgstr "木球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "cycling"
 msgstr "自行車"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "dog_racing"
 msgstr "賽狗"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "equestrian"
 msgstr "馬術"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "football"
 msgstr "美式足球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "golf"
 msgstr "高爾夫"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "gymnastics"
 msgstr "體操"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "hockey"
 msgstr "曲棍球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "horse_racing"
 msgstr "賽馬"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "motor"
 msgstr "摩托車"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "pelota"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "racquet"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "rugby"
 msgstr "橄欖球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "shooting"
 msgstr "射擊"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skateboard"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skating"
 msgstr ""
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "skiing"
 msgstr "滑雪"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "soccer"
 msgstr "足球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "swimming"
 msgstr "游泳"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "table_tennis"
 msgstr "桌球"
 
-#: build/trans_presets.java:1910 build/trans_presets.java:1919
-#: build/trans_presets.java:1928 build/trans_presets.java:1937
+#: build/trans_presets.java:1903 build/trans_presets.java:1912
+#: build/trans_presets.java:1921 build/trans_presets.java:1930
 msgid "tennis"
 msgstr "網球"
 
-#: build/trans_presets.java:1912
+#: build/trans_presets.java:1905
 msgid "Sports Centre"
 msgstr "運動中心"
 
 #. item "Sports/Sport Facilities/Sports Centre"
-#: build/trans_presets.java:1913
+#: build/trans_presets.java:1906
 msgid "Edit Sports Centre"
 msgstr "編輯運動中心"
 
-#: build/trans_presets.java:1921
+#: build/trans_presets.java:1914
 msgid "Pitch"
 msgstr ""
 
 #. item "Sports/Sport Facilities/Pitch"
-#: build/trans_presets.java:1922
+#: build/trans_presets.java:1915
 msgid "Edit Pitch"
 msgstr ""
 
-#: build/trans_presets.java:1930
+#: build/trans_presets.java:1923
 msgid "Racetrack"
 msgstr "跑道"
 
 #. item "Sports/Sport Facilities/Racetrack"
-#: build/trans_presets.java:1931
+#: build/trans_presets.java:1924
 msgid "Edit Racetrack"
 msgstr "編輯跑道"
 
-#: build/trans_presets.java:1939
+#: build/trans_presets.java:1932
 msgid "Golf Course"
 msgstr "高爾夫路線"
 
 #. item "Sports/Sport Facilities/Golf Course"
-#: build/trans_presets.java:1940
+#: build/trans_presets.java:1933
 msgid "Edit Golf Course"
 msgstr "編輯高爾夫路線"
 
-#: build/trans_presets.java:1945
+#: build/trans_presets.java:1938
 msgid "Miniature Golf"
 msgstr "迷你高爾夫"
 
 #. item "Sports/Sport Facilities/Miniature Golf"
-#: build/trans_presets.java:1946
+#: build/trans_presets.java:1939
 msgid "Edit Miniature Golf"
 msgstr "編輯迷你高爾夫"
 
-#: build/trans_presets.java:1952
+#: build/trans_presets.java:1945
 msgid "Sport"
 msgstr "運動"
 
 #. group "Sport"
-#: build/trans_presets.java:1953
+#: build/trans_presets.java:1946
 msgid "Multi"
 msgstr "多種"
 
 #. item "Sport/Multi"
-#: build/trans_presets.java:1954
+#: build/trans_presets.java:1947
 msgid "Edit Multi"
 msgstr "編輯多種"
@@ -24622,21 +24559,21 @@
 #. item "Sport (Ball)/Table Tennis" text "Name"
 #. item "Sport (Ball)/Tennis" text "Name"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "type"
 msgstr "類型"
@@ -24675,203 +24612,203 @@
 #. item "Sport (Ball)/Table Tennis" combo "type"
 #. item "Sport (Ball)/Tennis" combo "type"
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "pitch"
 msgstr ""
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "sports_centre"
 msgstr "運動中心"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "stadium"
 msgstr "競技揚"
 
-#: build/trans_presets.java:1957 build/trans_presets.java:1963
-#: build/trans_presets.java:1969 build/trans_presets.java:1975
-#: build/trans_presets.java:1981 build/trans_presets.java:1987
-#: build/trans_presets.java:1993 build/trans_presets.java:1999
-#: build/trans_presets.java:2005 build/trans_presets.java:2011
-#: build/trans_presets.java:2017 build/trans_presets.java:2023
-#: build/trans_presets.java:2029 build/trans_presets.java:2035
-#: build/trans_presets.java:2041 build/trans_presets.java:2050
-#: build/trans_presets.java:2057 build/trans_presets.java:2065
-#: build/trans_presets.java:2071 build/trans_presets.java:2077
-#: build/trans_presets.java:2083 build/trans_presets.java:2089
-#: build/trans_presets.java:2095 build/trans_presets.java:2101
-#: build/trans_presets.java:2107 build/trans_presets.java:2113
-#: build/trans_presets.java:2119 build/trans_presets.java:2125
-#: build/trans_presets.java:2131 build/trans_presets.java:2137
-#: build/trans_presets.java:2143 build/trans_presets.java:2149
-#: build/trans_presets.java:2155 build/trans_presets.java:2161
+#: build/trans_presets.java:1950 build/trans_presets.java:1956
+#: build/trans_presets.java:1962 build/trans_presets.java:1968
+#: build/trans_presets.java:1974 build/trans_presets.java:1980
+#: build/trans_presets.java:1986 build/trans_presets.java:1992
+#: build/trans_presets.java:1998 build/trans_presets.java:2004
+#: build/trans_presets.java:2010 build/trans_presets.java:2016
+#: build/trans_presets.java:2022 build/trans_presets.java:2028
+#: build/trans_presets.java:2034 build/trans_presets.java:2043
+#: build/trans_presets.java:2050 build/trans_presets.java:2058
+#: build/trans_presets.java:2064 build/trans_presets.java:2070
+#: build/trans_presets.java:2076 build/trans_presets.java:2082
+#: build/trans_presets.java:2088 build/trans_presets.java:2094
+#: build/trans_presets.java:2100 build/trans_presets.java:2106
+#: build/trans_presets.java:2112 build/trans_presets.java:2118
+#: build/trans_presets.java:2124 build/trans_presets.java:2130
+#: build/trans_presets.java:2136 build/trans_presets.java:2142
+#: build/trans_presets.java:2148 build/trans_presets.java:2154
 msgid "track"
 msgstr ""
 
-#: build/trans_presets.java:1959
+#: build/trans_presets.java:1952
 msgid "10pin"
 msgstr ""
 
 #. item "Sport/10pin"
-#: build/trans_presets.java:1960
+#: build/trans_presets.java:1953
 msgid "Edit 10pin"
 msgstr ""
 
-#: build/trans_presets.java:1965
+#: build/trans_presets.java:1958
 msgid "Athletics"
 msgstr "田徑"
 
 #. item "Sport/Athletics"
-#: build/trans_presets.java:1966
+#: build/trans_presets.java:1959
 msgid "Edit Athletics"
 msgstr "編輯田徑"
 
-#: build/trans_presets.java:1971
+#: build/trans_presets.java:1964
 msgid "Archery"
 msgstr "射箭"
 
 #. item "Sport/Archery"
-#: build/trans_presets.java:1972
+#: build/trans_presets.java:1965
 msgid "Edit Archery"
 msgstr "編輯射箭"
 
-#: build/trans_presets.java:1977
+#: build/trans_presets.java:1970
 msgid "Climbing"
 msgstr "攀岩"
 
 #. item "Sport/Climbing"
-#: build/trans_presets.java:1978
+#: build/trans_presets.java:1971
 msgid "Edit Climbing"
 msgstr "編輯攀岩"
 
-#: build/trans_presets.java:1983
+#: build/trans_presets.java:1976
 msgid "Canoeing"
 msgstr "獨木舟"
 
 #. item "Sport/Canoeing"
-#: build/trans_presets.java:1984
+#: build/trans_presets.java:1977
 msgid "Edit Canoeing"
 msgstr "編輯獨木舟"
 
 #. item "Sport/Cycling"
-#: build/trans_presets.java:1990
+#: build/trans_presets.java:1983
 msgid "Edit Cycling"
 msgstr "編輯自行車"
 
-#: build/trans_presets.java:1995
+#: build/trans_presets.java:1988
 msgid "Dog Racing"
 msgstr "賽狗"
 
 #. item "Sport/Dog Racing"
-#: build/trans_presets.java:1996
+#: build/trans_presets.java:1989
 msgid "Edit Dog Racing"
 msgstr "編輯賽狗"
 
-#: build/trans_presets.java:2001
+#: build/trans_presets.java:1994
 msgid "Equestrian"
 msgstr "馬術"
 
 #. item "Sport/Equestrian"
-#: build/trans_presets.java:2002
+#: build/trans_presets.java:1995
 msgid "Edit Equestrian"
 msgstr "編輯馬術"
 
-#: build/trans_presets.java:2007
+#: build/trans_presets.java:2000
 msgid "Horse Racing"
 msgstr "賽馬"
 
 #. item "Sport/Horse Racing"
-#: build/trans_presets.java:2008
+#: build/trans_presets.java:2001
 msgid "Edit Horse Racing"
 msgstr "編輯賽馬"
 
-#: build/trans_presets.java:2013
+#: build/trans_presets.java:2006
 msgid "Gymnastics"
 msgstr "體操"
 
 #. item "Sport/Gymnastics"
-#: build/trans_presets.java:2014
+#: build/trans_presets.java:2007
 msgid "Edit Gymnastics"
 msgstr "編輯體操"
 
-#: build/trans_presets.java:2019
+#: build/trans_presets.java:2012
 msgid "Motor Sports"
 msgstr "摩托車運動"
 
 #. item "Sport/Motor Sports"
-#: build/trans_presets.java:2020
+#: build/trans_presets.java:2013
 msgid "Edit Motor Sports"
 msgstr "編輯摩托車運動"
 
-#: build/trans_presets.java:2025
+#: build/trans_presets.java:2018
 msgid "Skating"
 msgstr "溜冰"
 
 #. item "Sport/Skating"
-#: build/trans_presets.java:2026
+#: build/trans_presets.java:2019
 msgid "Edit Skating"
 msgstr "編輯溜冰"
 
-#: build/trans_presets.java:2031
+#: build/trans_presets.java:2024
 msgid "Skateboard"
 msgstr "滑板"
 
 #. item "Sport/Skateboard"
-#: build/trans_presets.java:2032
+#: build/trans_presets.java:2025
 msgid "Edit Skateboard"
 msgstr "編輯滑板"
 
-#: build/trans_presets.java:2037
+#: build/trans_presets.java:2030
 msgid "Swimming"
 msgstr "游泳"
 
 #. item "Sport/Swimming"
-#: build/trans_presets.java:2038
+#: build/trans_presets.java:2031
 msgid "Edit Swimming"
 msgstr "編輯游泳"
@@ -24879,52 +24816,52 @@
 #. item "Sport/Skiing"
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Piste_Maps"/>
-#: build/trans_presets.java:2045
+#: build/trans_presets.java:2038
 msgid "Edit Skiing"
 msgstr "編輯滑雪"
 
 #. item "Sport/Skiing" text "Name"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "Piste type"
 msgstr ""
 
 #. item "Sport/Skiing" combo "Piste type"
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "downhill"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "nordic"
 msgstr ""
 
-#: build/trans_presets.java:2048
+#: build/trans_presets.java:2041
 msgid "snow_park"
 msgstr ""
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "Difficulty"
 msgstr "困難度"
 
 #. item "Sport/Skiing" combo "Difficulty"
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "novice"
 msgstr "新手"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "easy"
 msgstr "容易"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "advanced"
 msgstr "進階"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "expert"
 msgstr "專家"
 
-#: build/trans_presets.java:2049
+#: build/trans_presets.java:2042
 msgid "freeride"
 msgstr ""
 
-#: build/trans_presets.java:2052
+#: build/trans_presets.java:2045
 msgid "Shooting"
 msgstr "射擊"
@@ -24932,177 +24869,177 @@
 #. item "Sport/Shooting"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:sport=shooting" />
-#: build/trans_presets.java:2054
+#: build/trans_presets.java:2047
 msgid "Edit Shooting"
 msgstr "編輯射擊"
 
-#: build/trans_presets.java:2060
+#: build/trans_presets.java:2053
 msgid "Sport (Ball)"
 msgstr "運動（球類）"
 
 #. group "Sport (Ball)"
-#: build/trans_presets.java:2061
+#: build/trans_presets.java:2054
 msgid "Soccer"
 msgstr "足球"
 
 #. item "Sport (Ball)/Soccer"
-#: build/trans_presets.java:2062
+#: build/trans_presets.java:2055
 msgid "Edit Soccer"
 msgstr "編輯足球"
 
-#: build/trans_presets.java:2067
+#: build/trans_presets.java:2060
 msgid "Football"
 msgstr "美式足球"
 
 #. item "Sport (Ball)/Football"
-#: build/trans_presets.java:2068
+#: build/trans_presets.java:2061
 msgid "Edit Football"
 msgstr "編輯美式足球"
 
-#: build/trans_presets.java:2073
+#: build/trans_presets.java:2066
 msgid "Australian Football"
 msgstr "澳洲足球"
 
 #. item "Sport (Ball)/Australian Football"
-#: build/trans_presets.java:2074
+#: build/trans_presets.java:2067
 msgid "Edit Australian Football"
 msgstr "編輯澳洲足球"
 
-#: build/trans_presets.java:2079
+#: build/trans_presets.java:2072
 msgid "Baseball"
 msgstr "棒球"
 
 #. item "Sport (Ball)/Baseball"
-#: build/trans_presets.java:2080
+#: build/trans_presets.java:2073
 msgid "Edit Baseball"
 msgstr "編輯棒球"
 
-#: build/trans_presets.java:2085
+#: build/trans_presets.java:2078
 msgid "Basketball"
 msgstr "籃球"
 
 #. item "Sport (Ball)/Basketball"
-#: build/trans_presets.java:2086
+#: build/trans_presets.java:2079
 msgid "Edit Basketball"
 msgstr "編輯籃球"
 
-#: build/trans_presets.java:2091
+#: build/trans_presets.java:2084
 msgid "Golf"
 msgstr "高爾夫"
 
 #. item "Sport (Ball)/Golf"
-#: build/trans_presets.java:2092
+#: build/trans_presets.java:2085
 msgid "Edit Golf"
 msgstr "編輯高爾夫"
 
 #. item "Sport (Ball)/Golf" combo "type"
-#: build/trans_presets.java:2095
+#: build/trans_presets.java:2088
 msgid "golf_course"
 msgstr "高爾夫路線"
 
-#: build/trans_presets.java:2097
+#: build/trans_presets.java:2090
 msgid "Boule"
 msgstr ""
 
 #. item "Sport (Ball)/Boule"
-#: build/trans_presets.java:2098
+#: build/trans_presets.java:2091
 msgid "Edit Boule"
 msgstr ""
 
-#: build/trans_presets.java:2103
+#: build/trans_presets.java:2096
 msgid "Bowls"
 msgstr "保齡球"
 
 #. item "Sport (Ball)/Bowls"
-#: build/trans_presets.java:2104
+#: build/trans_presets.java:2097
 msgid "Edit Bowls"
 msgstr "編輯保齡球"
 
+#: build/trans_presets.java:2102
+msgid "Cricket"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket"
+#: build/trans_presets.java:2103
+msgid "Edit Cricket"
+msgstr ""
+
+#: build/trans_presets.java:2108
+msgid "Cricket Nets"
+msgstr ""
+
+#. item "Sport (Ball)/Cricket Nets"
 #: build/trans_presets.java:2109
-msgid "Cricket"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket"
-#: build/trans_presets.java:2110
-msgid "Edit Cricket"
-msgstr ""
-
-#: build/trans_presets.java:2115
-msgid "Cricket Nets"
-msgstr ""
-
-#. item "Sport (Ball)/Cricket Nets"
-#: build/trans_presets.java:2116
 msgid "Edit Cricket Nets"
 msgstr ""
 
-#: build/trans_presets.java:2121
+#: build/trans_presets.java:2114
 msgid "Croquet"
 msgstr "木球"
 
 #. item "Sport (Ball)/Croquet"
-#: build/trans_presets.java:2122
+#: build/trans_presets.java:2115
 msgid "Edit Croquet"
 msgstr "編輯木球"
 
-#: build/trans_presets.java:2127
+#: build/trans_presets.java:2120
 msgid "Hockey"
 msgstr "曲棍球"
 
 #. item "Sport (Ball)/Hockey"
-#: build/trans_presets.java:2128
+#: build/trans_presets.java:2121
 msgid "Edit Hockey"
 msgstr "編曲棍球"
 
-#: build/trans_presets.java:2133
+#: build/trans_presets.java:2126
 msgid "Pelota"
 msgstr "回力球"
 
 #. item "Sport (Ball)/Pelota"
-#: build/trans_presets.java:2134
+#: build/trans_presets.java:2127
 msgid "Edit Pelota"
 msgstr "編輯回力球"
 
-#: build/trans_presets.java:2139
+#: build/trans_presets.java:2132
 msgid "Racquet"
 msgstr ""
 
 #. item "Sport (Ball)/Racquet"
-#: build/trans_presets.java:2140
+#: build/trans_presets.java:2133
 msgid "Edit Racquet"
 msgstr ""
 
-#: build/trans_presets.java:2145
+#: build/trans_presets.java:2138
 msgid "Rugby"
 msgstr "橄欖球"
 
 #. item "Sport (Ball)/Rugby"
-#: build/trans_presets.java:2146
+#: build/trans_presets.java:2139
 msgid "Edit Rugby"
 msgstr "編輯橄欖球"
 
-#: build/trans_presets.java:2151
+#: build/trans_presets.java:2144
 msgid "Table Tennis"
 msgstr "桌球"
 
 #. item "Sport (Ball)/Table Tennis"
-#: build/trans_presets.java:2152
+#: build/trans_presets.java:2145
 msgid "Edit Table Tennis"
 msgstr "編輯桌球"
 
-#: build/trans_presets.java:2157
+#: build/trans_presets.java:2150
 msgid "Tennis"
 msgstr "網球"
 
 #. item "Sport (Ball)/Tennis"
-#: build/trans_presets.java:2158
+#: build/trans_presets.java:2151
 msgid "Edit Tennis"
 msgstr "編輯網路"
 
-#: build/trans_presets.java:2165
+#: build/trans_presets.java:2158
 msgid "Man-Made"
 msgstr "人造物"
 
 #. group "Man-Made/Buildings"
-#: build/trans_presets.java:2167
+#: build/trans_presets.java:2160
 msgid "Building"
 msgstr "建築物"
@@ -25110,5 +25047,5 @@
 #. item "Man-Made/Buildings/Building"
 #. <key key="building" value="yes" />
-#: build/trans_presets.java:2170
+#: build/trans_presets.java:2163
 msgid "Public Building"
 msgstr "公共建築"
@@ -25116,10 +25053,10 @@
 #. item "Man-Made/Buildings/Public Building"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=public_building" />
-#: build/trans_presets.java:2172
+#: build/trans_presets.java:2165
 msgid "Edit Public Building"
 msgstr "編輯公共建築"
 
 #. item "Man-Made/Buildings/Public Building" text "Name"
-#: build/trans_presets.java:2176
+#: build/trans_presets.java:2169
 msgid "Town hall"
 msgstr "縣市政府/公所"
@@ -25127,10 +25064,10 @@
 #. item "Man-Made/Buildings/Town hall"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=townhall" />
-#: build/trans_presets.java:2178
+#: build/trans_presets.java:2171
 msgid "Edit Town hall"
 msgstr "編輯縣市政府/公所"
 
 #. item "Man-Made/Buildings/Town hall" text "Name"
-#: build/trans_presets.java:2182
+#: build/trans_presets.java:2175
 msgid "Embassy"
 msgstr "大使館"
@@ -25138,10 +25075,10 @@
 #. item "Man-Made/Buildings/Embassy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=embassy" />
-#: build/trans_presets.java:2184
+#: build/trans_presets.java:2177
 msgid "Edit Embassy"
 msgstr "編輯大使館"
 
 #. item "Man-Made/Buildings/Embassy" text "Name"
-#: build/trans_presets.java:2188
+#: build/trans_presets.java:2181
 msgid "Courthouse"
 msgstr "法院"
@@ -25150,10 +25087,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=courthouse"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=courthouse" />
-#: build/trans_presets.java:2191
+#: build/trans_presets.java:2184
 msgid "Edit Courthouse"
 msgstr "編輯法院"
 
 #. item "Man-Made/Buildings/Courthouse" text "Name"
-#: build/trans_presets.java:2195
+#: build/trans_presets.java:2188
 msgid "Prison"
 msgstr "監獄"
@@ -25162,10 +25099,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=prison"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=prison" />
-#: build/trans_presets.java:2198
+#: build/trans_presets.java:2191
 msgid "Edit Prison"
 msgstr "編輯監獄"
 
 #. item "Man-Made/Buildings/Prison" text "Name"
-#: build/trans_presets.java:2202
+#: build/trans_presets.java:2195
 msgid "Police"
 msgstr "警察局"
@@ -25175,10 +25112,10 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=police"
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=police" />
-#: build/trans_presets.java:2206
+#: build/trans_presets.java:2199
 msgid "Edit Police"
 msgstr "編輯警察局"
 
 #. item "Man-Made/Buildings/Police" text "Name"
-#: build/trans_presets.java:2210
+#: build/trans_presets.java:2203
 msgid "Fire Station"
 msgstr "消防隊"
@@ -25187,10 +25124,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire_station"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire_station" />
-#: build/trans_presets.java:2213
+#: build/trans_presets.java:2206
 msgid "Edit Fire Station"
 msgstr "編輯消防隊"
 
 #. item "Man-Made/Buildings/Fire Station" text "Name"
-#: build/trans_presets.java:2217
+#: build/trans_presets.java:2210
 msgid "Post Office"
 msgstr "郵局"
@@ -25198,5 +25135,5 @@
 #. item "Man-Made/Buildings/Post Office"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_office" />
-#: build/trans_presets.java:2219
+#: build/trans_presets.java:2212
 msgid "Edit Post Office"
 msgstr "編輯郵局"
@@ -25204,15 +25141,15 @@
 #. item "Man-Made/Buildings/Post Office" text "Operator"
 #. <separator/>
-#: build/trans_presets.java:2225
+#: build/trans_presets.java:2218
 msgid "Kindergarten"
 msgstr "幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten"
-#: build/trans_presets.java:2226
+#: build/trans_presets.java:2219
 msgid "Edit Kindergarten"
 msgstr "編輯幼稚園"
 
 #. item "Man-Made/Buildings/Kindergarten" text "Name"
-#: build/trans_presets.java:2230
+#: build/trans_presets.java:2223
 msgid "School"
 msgstr "學校"
@@ -25220,10 +25157,10 @@
 #. item "Man-Made/Buildings/School"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=school" />
-#: build/trans_presets.java:2232
+#: build/trans_presets.java:2225
 msgid "Edit School"
 msgstr "編輯學校"
 
 #. item "Man-Made/Buildings/School" text "Name"
-#: build/trans_presets.java:2236
+#: build/trans_presets.java:2229
 msgid "University"
 msgstr "大學"
@@ -25231,10 +25168,10 @@
 #. item "Man-Made/Buildings/University"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=university" />
-#: build/trans_presets.java:2238
+#: build/trans_presets.java:2231
 msgid "Edit University"
 msgstr "編輯大學"
 
 #. item "Man-Made/Buildings/University" text "Name"
-#: build/trans_presets.java:2242
+#: build/trans_presets.java:2235
 msgid "College"
 msgstr "學院"
@@ -25242,5 +25179,5 @@
 #. item "Man-Made/Buildings/College"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=college" />
-#: build/trans_presets.java:2244
+#: build/trans_presets.java:2237
 msgid "Edit College"
 msgstr "編輯學院"
@@ -25248,5 +25185,5 @@
 #. item "Man-Made/Buildings/College" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2249
+#: build/trans_presets.java:2242
 msgid "Cinema"
 msgstr "電影院"
@@ -25255,10 +25192,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=cinema"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=cinema" />
-#: build/trans_presets.java:2252
+#: build/trans_presets.java:2245
 msgid "Edit Cinema"
 msgstr "編輯電影院"
 
 #. item "Man-Made/Buildings/Cinema" text "Name"
-#: build/trans_presets.java:2256
+#: build/trans_presets.java:2249
 msgid "Library"
 msgstr "圖書館"
@@ -25267,9 +25204,9 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=library"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=library" />
-#: build/trans_presets.java:2259
+#: build/trans_presets.java:2252
 msgid "Edit Library"
 msgstr "編輯圖書館"
 
-#: build/trans_presets.java:2264
+#: build/trans_presets.java:2257
 msgid "Arts Centre"
 msgstr "美術館"
@@ -25277,10 +25214,10 @@
 #. item "Man-Made/Buildings/Arts Centre"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=arts_centre" />
-#: build/trans_presets.java:2266
+#: build/trans_presets.java:2259
 msgid "Edit Arts Centre"
 msgstr "編輯美術館"
 
 #. item "Man-Made/Buildings/Arts Centre" text "Name"
-#: build/trans_presets.java:2270
+#: build/trans_presets.java:2263
 msgid "Theatre"
 msgstr "劇院"
@@ -25289,10 +25226,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=theatre"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=theatre" />
-#: build/trans_presets.java:2273
+#: build/trans_presets.java:2266
 msgid "Edit Theatre"
 msgstr "編輯劇院"
 
 #. item "Man-Made/Buildings/Theatre" text "Name"
-#: build/trans_presets.java:2277
+#: build/trans_presets.java:2270
 msgid "Place of Worship"
 msgstr "宗教儀式場所"
@@ -25302,5 +25239,5 @@
 #. it.href="http://wiki.openstreetmap.org/wiki/IT:Tag:amenity=place_of_worship"
 #. sv.href="http://wiki.openstreetmap.org/wiki/Sv:Tag:amenity=place_of_worship" />
-#: build/trans_presets.java:2281
+#: build/trans_presets.java:2274
 msgid "Edit Place of Worship"
 msgstr "編輯宗教儀式場所"
@@ -25309,6 +25246,6 @@
 #. item "Land use/Graveyard" text "Name"
 #. item "Land use/Cemetery" text "Name"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "Religion"
 msgstr "宗教"
@@ -25317,66 +25254,66 @@
 #. item "Land use/Graveyard" combo "Religion"
 #. item "Land use/Cemetery" combo "Religion"
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "bahai"
 msgstr "巴海大同教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "buddhist"
 msgstr "佛教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "christian"
 msgstr "基督教系"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "hindu"
 msgstr "印度教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jain"
 msgstr "耆那教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "jewish"
 msgstr "猶太教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "muslim"
 msgstr "回教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "sikh"
 msgstr "錫克教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "spiritualist"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "taoist"
 msgstr "道教"
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "unitarian"
 msgstr ""
 
-#: build/trans_presets.java:2284 build/trans_presets.java:3109
-#: build/trans_presets.java:3118
+#: build/trans_presets.java:2277 build/trans_presets.java:3102
+#: build/trans_presets.java:3111
 msgid "zoroastrian"
 msgstr "祆教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "Denomination"
 msgstr "教派"
@@ -25385,81 +25322,81 @@
 #. item "Land use/Graveyard" combo "Denomination"
 #. item "Land use/Cemetery" combo "Denomination"
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "anglican"
 msgstr "英國國教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "baptist"
 msgstr "浸信會"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "catholic"
 msgstr "天主教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "evangelical"
 msgstr "福音派教會"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "jehovahs_witness"
 msgstr ""
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "lutheran"
 msgstr "路德教派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "methodist"
 msgstr "衛理公會教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "mormon"
 msgstr "摩門教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "orthodox"
 msgstr "東正教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "pentecostal"
 msgstr "聖靈降臨教派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "presbyterian"
 msgstr "長老派教會"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "protestant"
 msgstr "新教"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "quaker"
 msgstr "教友派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "shia"
 msgstr "什葉派"
 
-#: build/trans_presets.java:2285 build/trans_presets.java:3110
-#: build/trans_presets.java:3119
+#: build/trans_presets.java:2278 build/trans_presets.java:3103
+#: build/trans_presets.java:3112
 msgid "sunni"
 msgstr "遜尼派"
 
 #. <separator/>
-#: build/trans_presets.java:2289
+#: build/trans_presets.java:2282
 msgid "Addresses"
 msgstr "地址"
@@ -25468,5 +25405,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2292
+#: build/trans_presets.java:2285
 msgid "Edit Address Information"
 msgstr "編輯地址資訊"
@@ -25474,5 +25411,5 @@
 #. item "Man-Made/Buildings/Addresses" label "Edit Address Information"
 #. <space />
-#: build/trans_presets.java:2294
+#: build/trans_presets.java:2287
 msgid "House number"
 msgstr ""
@@ -25480,25 +25417,25 @@
 #. item "Man-Made/Buildings/Addresses" text "House number"
 #. <optional>
-#: build/trans_presets.java:2296
+#: build/trans_presets.java:2289
 msgid "House name"
 msgstr ""
 
 #. item "Man-Made/Buildings/Addresses" text "House name"
-#: build/trans_presets.java:2297
+#: build/trans_presets.java:2290
 msgid "Street name"
 msgstr "街道名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "Street name"
-#: build/trans_presets.java:2298
+#: build/trans_presets.java:2291
 msgid "City name"
 msgstr "城市名稱"
 
 #. item "Man-Made/Buildings/Addresses" text "City name"
-#: build/trans_presets.java:2299
+#: build/trans_presets.java:2292
 msgid "Post code"
 msgstr "郵遞區號"
 
 #. item "Man-Made/Buildings/Addresses" text "Post code"
-#: build/trans_presets.java:2300
+#: build/trans_presets.java:2293
 msgid "Country code"
 msgstr "國碼"
@@ -25507,5 +25444,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/House_numbers/Karlsruhe_Schema"
 #. de.href="http://wiki.openstreetmap.org/wiki/Proposed_features/De:Hausnummern" />
-#: build/trans_presets.java:2306
+#: build/trans_presets.java:2299
 msgid "Edit Address Interpolation"
 msgstr ""
@@ -25513,61 +25450,61 @@
 #. item "Man-Made/Buildings/Address Interpolation" label "Edit Address Interpolation"
 #. <space />
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "Numbering scheme"
 msgstr "編號規則"
 
 #. item "Man-Made/Buildings/Address Interpolation" combo "Numbering scheme"
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "odd"
 msgstr "奇數"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "even"
 msgstr "偶數"
 
-#: build/trans_presets.java:2308
+#: build/trans_presets.java:2301
 msgid "alphabetic"
 msgstr "按字母順序"
 
-#: build/trans_presets.java:2311
+#: build/trans_presets.java:2304
 msgid "Man Made"
 msgstr "人造物"
 
 #. group "Man Made"
-#: build/trans_presets.java:2312
+#: build/trans_presets.java:2305
 msgid "Works"
 msgstr "作品"
 
 #. item "Man Made/Works"
-#: build/trans_presets.java:2313
+#: build/trans_presets.java:2306
 msgid "Edit Works"
 msgstr "編輯作品"
 
 #. item "Man Made/Works" text "Name"
-#: build/trans_presets.java:2317
+#: build/trans_presets.java:2310
 msgid "Tower"
 msgstr "塔"
 
 #. item "Man Made/Tower"
-#: build/trans_presets.java:2318
+#: build/trans_presets.java:2311
 msgid "Edit Tower"
 msgstr "編輯塔"
 
 #. item "Man Made/Tower" text "Name"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "Tower type"
 msgstr ""
 
 #. item "Man Made/Tower" combo "Tower type"
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "communication"
 msgstr "通訊"
 
-#: build/trans_presets.java:2321
+#: build/trans_presets.java:2314
 msgid "observation"
 msgstr "觀測"
 
 #. <optional>
-#: build/trans_presets.java:2323
+#: build/trans_presets.java:2316
 msgid "Height (meters)"
 msgstr "高度（米）"
@@ -25575,25 +25512,25 @@
 #. item "Man Made/Tower" text "Operator"
 #. </optional>
-#: build/trans_presets.java:2327
+#: build/trans_presets.java:2320
 msgid "Water Tower"
 msgstr "貯水塔"
 
 #. item "Man Made/Water Tower"
-#: build/trans_presets.java:2328
+#: build/trans_presets.java:2321
 msgid "Edit Water Tower"
 msgstr "編輯貯水塔"
 
 #. item "Man Made/Water Tower" text "Name"
-#: build/trans_presets.java:2332
+#: build/trans_presets.java:2325
 msgid "Gasometer"
 msgstr "貯氣桶"
 
 #. item "Man Made/Gasometer"
-#: build/trans_presets.java:2333
+#: build/trans_presets.java:2326
 msgid "Edit Gasometer"
 msgstr "編輯貯氣桶"
 
 #. item "Man Made/Gasometer" text "Name"
-#: build/trans_presets.java:2337
+#: build/trans_presets.java:2330
 msgid "Lighthouse"
 msgstr "燈塔"
@@ -25601,10 +25538,10 @@
 #. item "Man Made/Lighthouse"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=lighthouse" />
-#: build/trans_presets.java:2339
+#: build/trans_presets.java:2332
 msgid "Edit Lighthouse"
 msgstr "編輯燈塔"
 
 #. item "Man Made/Lighthouse" text "Name"
-#: build/trans_presets.java:2343
+#: build/trans_presets.java:2336
 msgid "Windmill"
 msgstr "風車"
@@ -25612,10 +25549,10 @@
 #. item "Man Made/Windmill"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=windmill" />
-#: build/trans_presets.java:2345
+#: build/trans_presets.java:2338
 msgid "Edit Windmill"
 msgstr "編輯風車"
 
 #. item "Man Made/Windmill" text "Name"
-#: build/trans_presets.java:2349
+#: build/trans_presets.java:2342
 msgid "Pipeline"
 msgstr "油管"
@@ -25624,41 +25561,41 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=pipeline"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=pipeline"/>
-#: build/trans_presets.java:2352
+#: build/trans_presets.java:2345
 msgid "Edit Pipeline"
 msgstr "編輯油管"
 
-#: build/trans_presets.java:2355 build/trans_presets.java:2398
+#: build/trans_presets.java:2348 build/trans_presets.java:2391
 msgid "gas"
 msgstr "天然氣"
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "heat"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "oil"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "sewage"
 msgstr ""
 
-#: build/trans_presets.java:2355
+#: build/trans_presets.java:2348
 msgid "any substance"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "Location"
 msgstr "位置"
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "underwater"
 msgstr ""
 
-#: build/trans_presets.java:2356
+#: build/trans_presets.java:2349
 msgid "overground"
 msgstr ""
 
-#: build/trans_presets.java:2358
+#: build/trans_presets.java:2351
 msgid "Wastewater Plant"
 msgstr "汙水處理廠"
@@ -25668,10 +25605,10 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:man_made=wastewater_plant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:man_made=wastewater_plant" />
-#: build/trans_presets.java:2362
+#: build/trans_presets.java:2355
 msgid "Edit Wastewater Plant"
 msgstr "編輯汙水處理廠"
 
 #. item "Man Made/Wastewater Plant" text "Name"
-#: build/trans_presets.java:2366
+#: build/trans_presets.java:2359
 msgid "Crane"
 msgstr "起重機"
@@ -25679,5 +25616,5 @@
 #. item "Man Made/Crane"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=crane" />
-#: build/trans_presets.java:2368
+#: build/trans_presets.java:2361
 msgid "Edit Crane"
 msgstr "編輯起重機"
@@ -25685,10 +25622,10 @@
 #. item "Man Made/Beacon"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=beacon" />
-#: build/trans_presets.java:2374
+#: build/trans_presets.java:2367
 msgid "Edit Beacon"
 msgstr ""
 
 #. item "Man Made/Beacon" text "Name"
-#: build/trans_presets.java:2378
+#: build/trans_presets.java:2371
 msgid "Survey Point"
 msgstr "測量點"
@@ -25696,10 +25633,10 @@
 #. item "Man Made/Survey Point"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=survey_point" />
-#: build/trans_presets.java:2380
+#: build/trans_presets.java:2373
 msgid "Edit Survey Point"
 msgstr "編輯測量點"
 
 #. item "Man Made/Survey Point" text "Name"
-#: build/trans_presets.java:2384
+#: build/trans_presets.java:2377
 msgid "Surveillance"
 msgstr "監視"
@@ -25707,23 +25644,23 @@
 #. item "Man Made/Surveillance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:man_made=surveillance" />
-#: build/trans_presets.java:2386
+#: build/trans_presets.java:2379
 msgid "Edit Surveillance Camera"
 msgstr "編輯監視攝影機"
 
 #. item "Man Made/Surveillance" combo "Type"
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "indoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "outdoor"
 msgstr ""
 
-#: build/trans_presets.java:2389
+#: build/trans_presets.java:2382
 msgid "public"
 msgstr ""
 
 #. <separator/>
-#: build/trans_presets.java:2392
+#: build/trans_presets.java:2385
 msgid "Power Generator"
 msgstr "發電廠"
@@ -25733,35 +25670,35 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=generator"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=generator" />
-#: build/trans_presets.java:2396
+#: build/trans_presets.java:2389
 msgid "Edit Power Generator"
 msgstr "編輯發電廠"
 
 #. item "Man Made/Power Generator" combo "Type"
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "wind"
 msgstr "風力"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "hydro"
 msgstr "水力"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "fossil"
 msgstr "燃油"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "nuclear"
 msgstr "核能"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "coal"
 msgstr "燃媒"
 
-#: build/trans_presets.java:2398
+#: build/trans_presets.java:2391
 msgid "photovoltaic"
 msgstr "光電"
 
 #. item "Man Made/Power Generator" text "Name"
-#: build/trans_presets.java:2401
+#: build/trans_presets.java:2394
 msgid "Power Station"
 msgstr ""
@@ -25770,10 +25707,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2404
+#: build/trans_presets.java:2397
 msgid "Edit Power Station"
 msgstr ""
 
 #. item "Man Made/Power Station" text "Reference"
-#: build/trans_presets.java:2410
+#: build/trans_presets.java:2403
 msgid "Power Sub Station"
 msgstr ""
@@ -25782,5 +25719,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=sub_station"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=sub_station" />
-#: build/trans_presets.java:2413
+#: build/trans_presets.java:2406
 msgid "Edit Power Sub Station"
 msgstr ""
@@ -25788,10 +25725,10 @@
 #. item "Man Made/Power Sub Station" text "Operator"
 #. item "Man Made/Power Line" text "Operator"
-#: build/trans_presets.java:2416 build/trans_presets.java:2433
+#: build/trans_presets.java:2409 build/trans_presets.java:2426
 msgid "Line reference"
 msgstr ""
 
 #. item "Man Made/Power Sub Station" text "Line reference"
-#: build/trans_presets.java:2418
+#: build/trans_presets.java:2411
 msgid "Power Tower"
 msgstr "電塔"
@@ -25802,23 +25739,23 @@
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:power=tower"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Tag:power=tower" />
-#: build/trans_presets.java:2423
+#: build/trans_presets.java:2416
 msgid "Edit Power Tower"
 msgstr "編輯電塔"
 
 #. item "Man Made/Power Tower" combo "Type"
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "tower"
 msgstr ""
 
-#: build/trans_presets.java:2424
+#: build/trans_presets.java:2417
 msgid "pole"
 msgstr ""
 
-#: build/trans_presets.java:2425
+#: build/trans_presets.java:2418
 msgid "Tower reference"
 msgstr ""
 
 #. item "Man Made/Power Tower" text "Tower reference"
-#: build/trans_presets.java:2427
+#: build/trans_presets.java:2420
 msgid "Power Line"
 msgstr "電線"
@@ -25827,74 +25764,74 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:power=line"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:power=line" />
-#: build/trans_presets.java:2430
+#: build/trans_presets.java:2423
 msgid "Edit Power Line"
 msgstr "編輯電線"
 
 #. item "Man Made/Power Line" label "Edit Power Line"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "Line type"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Line type"
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "line"
 msgstr ""
 
-#: build/trans_presets.java:2431
+#: build/trans_presets.java:2424
 msgid "minor_line"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Voltage"
-#: build/trans_presets.java:2436
+#: build/trans_presets.java:2429
 msgid "Amount of Cables"
 msgstr ""
 
 #. item "Man Made/Power Line" text "Amount of Cables"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "Number of wires (better: conductors) per power cable"
 msgstr ""
 
 #. item "Man Made/Power Line" combo "Number of wires (better: conductors) per power cable"
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "single"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "double"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "triple"
 msgstr ""
 
-#: build/trans_presets.java:2437
+#: build/trans_presets.java:2430
 msgid "quad"
 msgstr ""
 
-#: build/trans_presets.java:2440
+#: build/trans_presets.java:2433
 msgid "Amenities"
 msgstr "便利設施"
 
 #. group "Amenities"
-#: build/trans_presets.java:2441
+#: build/trans_presets.java:2434
 msgid "Toilets"
 msgstr "廁所"
 
-#: build/trans_presets.java:2448
+#: build/trans_presets.java:2441
 msgid "limited"
 msgstr ""
 
 #. item "Shops/Vending machine" text "Reference number"
-#: build/trans_presets.java:2449 build/trans_presets.java:2590
+#: build/trans_presets.java:2442 build/trans_presets.java:2732
 msgid "Note"
 msgstr ""
 
 #. item "Amenities/Toilets" text "Note"
-#: build/trans_presets.java:2451
+#: build/trans_presets.java:2444
 msgid "Post Box"
 msgstr "郵筒"
 
 #. item "Amenities/Post Box" text "Operator"
-#: build/trans_presets.java:2456
+#: build/trans_presets.java:2449
 msgid "Telephone"
 msgstr "電話"
@@ -25903,5 +25840,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=telephone"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=telephone" />
-#: build/trans_presets.java:2459
+#: build/trans_presets.java:2452
 msgid "Edit Telephone"
 msgstr "編輯電話"
@@ -25909,5 +25846,5 @@
 #. item "Amenities/Telephone" text "Operator"
 #. item "Shops/Vending machine" text "Note"
-#: build/trans_presets.java:2462 build/trans_presets.java:2591
+#: build/trans_presets.java:2455 build/trans_presets.java:2733
 msgid "Coins"
 msgstr "硬幣"
@@ -25915,5 +25852,5 @@
 #. item "Amenities/Telephone" check "Coins"
 #. item "Shops/Vending machine" check "Coins"
-#: build/trans_presets.java:2463 build/trans_presets.java:2592
+#: build/trans_presets.java:2456 build/trans_presets.java:2734
 msgid "Notes"
 msgstr ""
@@ -25921,5 +25858,5 @@
 #. item "Amenities/Telephone" check "Notes"
 #. item "Shops/Vending machine" check "Notes"
-#: build/trans_presets.java:2464 build/trans_presets.java:2593
+#: build/trans_presets.java:2457 build/trans_presets.java:2735
 msgid "Electronic purses and Charge cards"
 msgstr "電子錢包或收費卡"
@@ -25927,5 +25864,5 @@
 #. item "Amenities/Telephone" check "Electronic purses and Charge cards"
 #. item "Shops/Vending machine" check "Electronic purses and Charge cards"
-#: build/trans_presets.java:2465 build/trans_presets.java:2594
+#: build/trans_presets.java:2458 build/trans_presets.java:2736
 msgid "Debit cards"
 msgstr ""
@@ -25933,15 +25870,15 @@
 #. item "Amenities/Telephone" check "Debit cards"
 #. item "Shops/Vending machine" check "Debit cards"
-#: build/trans_presets.java:2466 build/trans_presets.java:2595
+#: build/trans_presets.java:2459 build/trans_presets.java:2737
 msgid "Credit cards"
 msgstr "信用卡"
 
 #. item "Amenities/Telephone" check "Credit cards"
-#: build/trans_presets.java:2467
+#: build/trans_presets.java:2460
 msgid "Telephone cards"
 msgstr "電話卡"
 
 #. item "Amenities/Telephone" check "Telephone cards"
-#: build/trans_presets.java:2469
+#: build/trans_presets.java:2462
 msgid "Recycling"
 msgstr "資源回收"
@@ -25950,5 +25887,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=recycling" />
-#: build/trans_presets.java:2472
+#: build/trans_presets.java:2465
 msgid "Edit Recycling station"
 msgstr "資源回收站"
@@ -25956,35 +25893,35 @@
 #. item "Amenities/Recycling" label "Edit Recycling station"
 #. <key key="amenity" value="recycling" />
-#: build/trans_presets.java:2474
+#: build/trans_presets.java:2467
 msgid "Batteries"
 msgstr "電池"
 
 #. item "Amenities/Recycling" check "Batteries"
-#: build/trans_presets.java:2475
+#: build/trans_presets.java:2468
 msgid "Cans"
 msgstr "瓶罐"
 
 #. item "Amenities/Recycling" check "Cans"
-#: build/trans_presets.java:2476
+#: build/trans_presets.java:2469
 msgid "Clothes"
 msgstr "衣服"
 
 #. item "Amenities/Recycling" check "Clothes"
-#: build/trans_presets.java:2477
+#: build/trans_presets.java:2470
 msgid "Glass"
 msgstr "玻璃"
 
 #. item "Amenities/Recycling" check "Glass"
-#: build/trans_presets.java:2478
+#: build/trans_presets.java:2471
 msgid "Paper"
 msgstr "紙張"
 
 #. item "Amenities/Recycling" check "Paper"
-#: build/trans_presets.java:2479
+#: build/trans_presets.java:2472
 msgid "Scrap Metal"
 msgstr "廢金屬"
 
 #. item "Amenities/Recycling" check "Scrap Metal"
-#: build/trans_presets.java:2481
+#: build/trans_presets.java:2474
 msgid "Waste Basket"
 msgstr ""
@@ -25992,5 +25929,5 @@
 #. item "Amenities/Waste Basket"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity%3Dwaste_basket" />
-#: build/trans_presets.java:2483
+#: build/trans_presets.java:2476
 msgid "Edit Waste Basket"
 msgstr ""
@@ -25999,31 +25936,31 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bench" />
 #. <key key="amenity" value="bench" />
-#: build/trans_presets.java:2489
+#: build/trans_presets.java:2482
 msgid "Backrest"
 msgstr ""
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "Material"
 msgstr "材質"
 
 #. item "Amenities/Bench" combo "Material"
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "stone"
 msgstr "石頭"
 
-#: build/trans_presets.java:2490
+#: build/trans_presets.java:2483
 msgid "plastic"
 msgstr "塑膠"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "Colour"
 msgstr "顏色"
 
 #. item "Amenities/Bench" combo "Colour"
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "black"
 msgstr "黑色"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "brown"
 msgstr "淺褐色"
@@ -26102,5 +26039,5 @@
 #. <rule>
 #. <condition k="landuse" v="recreation_ground"/>
-#: build/trans_presets.java:2491 build/trans_style.java:3157
+#: build/trans_presets.java:2484 build/trans_style.java:3157
 #: build/trans_style.java:3165 build/trans_style.java:3173
 #: build/trans_style.java:3181 build/trans_style.java:3189
@@ -26110,31 +26047,31 @@
 msgstr "綠色"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "red"
 msgstr "紅色"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "blue"
 msgstr "藍色"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "gray"
 msgstr "灰色"
 
-#: build/trans_presets.java:2491
+#: build/trans_presets.java:2484
 msgid "white"
 msgstr "白色"
 
-#: build/trans_presets.java:2492
+#: build/trans_presets.java:2485
 msgid "Amount of Seats"
 msgstr "座椅數量"
 
 #. item "Amenities/Bench" combo "Amount of Seats"
-#: build/trans_presets.java:2494
+#: build/trans_presets.java:2487
 msgid "Hunting Stand"
 msgstr ""
 
 #. item "Amenities/Hunting Stand"
-#: build/trans_presets.java:2495
+#: build/trans_presets.java:2488
 msgid "Edit Hunting Stand"
 msgstr ""
@@ -26143,30 +26080,30 @@
 #. <key key="amenity" value="hunting_stand" />
 #. item "Land use/Tree" text "Type"
-#: build/trans_presets.java:2497 build/trans_presets.java:2979
+#: build/trans_presets.java:2490 build/trans_presets.java:2972
 msgid "Height"
 msgstr "高度"
 
 #. item "Amenities/Hunting Stand" combo "Height"
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "low"
 msgstr "低"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "half"
 msgstr "半高"
 
-#: build/trans_presets.java:2497
+#: build/trans_presets.java:2490
 msgid "full"
 msgstr "全高"
 
-#: build/trans_presets.java:2499
+#: build/trans_presets.java:2492
 msgid "Hide"
 msgstr "隱藏"
 
-#: build/trans_presets.java:2500
+#: build/trans_presets.java:2493
 msgid "Lock"
 msgstr "鎖"
 
-#: build/trans_presets.java:2502
+#: build/trans_presets.java:2495
 msgid "Fountain"
 msgstr "噴泉"
@@ -26175,10 +26112,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fountain"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=fountain" />
-#: build/trans_presets.java:2505
+#: build/trans_presets.java:2498
 msgid "Edit Fountain"
 msgstr "編輯噴泉"
 
 #. item "Amenities/Fountain" text "Name"
-#: build/trans_presets.java:2509
+#: build/trans_presets.java:2502
 msgid "Drinking Water"
 msgstr "飲水機"
@@ -26187,10 +26124,10 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=drinking_water"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=drinking_water" />
-#: build/trans_presets.java:2512
+#: build/trans_presets.java:2505
 msgid "Edit Drinking Water"
 msgstr "編輯飲水機"
 
 #. item "Amenities/Drinking Water" text "Name"
-#: build/trans_presets.java:2516
+#: build/trans_presets.java:2509
 msgid "Fire Hydrant"
 msgstr ""
@@ -26199,5 +26136,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=fire hydrant"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:fire hydrant" />
-#: build/trans_presets.java:2519
+#: build/trans_presets.java:2512
 msgid "Edit Fire Hydrant"
 msgstr ""
@@ -26205,5 +26142,5 @@
 #. item "Amenities/Fire Hydrant" label "Edit Fire Hydrant"
 #. <key key="amenity" value="fire_hydrant" />
-#: build/trans_presets.java:2522
+#: build/trans_presets.java:2515
 msgid "Baby Hatch"
 msgstr ""
@@ -26211,15 +26148,15 @@
 #. item "Amenities/Baby Hatch"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=baby_hatch" />
-#: build/trans_presets.java:2524
+#: build/trans_presets.java:2517
 msgid "Edit Baby Hatch"
 msgstr ""
 
 #. item "Amenities/Baby Hatch" text "Opening Hours"
-#: build/trans_presets.java:2530
+#: build/trans_presets.java:2523
 msgid "Shops"
 msgstr "商店"
 
 #. group "Shops"
-#: build/trans_presets.java:2531
+#: build/trans_presets.java:2524
 msgid "Car Dealer"
 msgstr ""
@@ -26227,10 +26164,10 @@
 #. item "Shops/Car Dealer"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=car" />
-#: build/trans_presets.java:2533
+#: build/trans_presets.java:2526
 msgid "Edit Car Shop"
 msgstr "編輯汽車商店"
 
 #. item "Shops/Car Dealer" text "Operator"
-#: build/trans_presets.java:2538
+#: build/trans_presets.java:2531
 msgid "Bike Dealer"
 msgstr ""
@@ -26239,28 +26176,28 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bicycle"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:shop=bicycle" />
-#: build/trans_presets.java:2541
+#: build/trans_presets.java:2534
 msgid "Edit Bicycle Shop"
 msgstr "編輯自行車商店"
 
 #. item "Shops/Bike Dealer" text "Name"
-#: build/trans_presets.java:2545
+#: build/trans_presets.java:2538
 msgid "Supermarket"
 msgstr "超級市場"
 
 #. item "Shops/Supermarket"
-#: build/trans_presets.java:2546
+#: build/trans_presets.java:2539
 msgid "Edit Supermarket"
 msgstr "編輯超級市場"
 
-#: build/trans_presets.java:2551
+#: build/trans_presets.java:2544
 msgid "Chemist"
 msgstr ""
 
 #. item "Shops/Chemist"
-#: build/trans_presets.java:2552
+#: build/trans_presets.java:2545
 msgid "Edit Chemist"
 msgstr ""
 
-#: build/trans_presets.java:2557
+#: build/trans_presets.java:2550
 msgid "Convenience Store"
 msgstr "便利商店"
@@ -26268,9 +26205,9 @@
 #. item "Shops/Convenience Store"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=convenience" />
-#: build/trans_presets.java:2559
+#: build/trans_presets.java:2552
 msgid "Edit Convenience Store"
 msgstr "編輯便利商店"
 
-#: build/trans_presets.java:2564
+#: build/trans_presets.java:2557
 msgid "Kiosk"
 msgstr ""
@@ -26278,27 +26215,241 @@
 #. item "Shops/Kiosk"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=kiosk" />
-#: build/trans_presets.java:2566
+#: build/trans_presets.java:2559
 msgid "Edit Kiosk"
 msgstr ""
 
-#: build/trans_presets.java:2571
+#: build/trans_presets.java:2564
 msgid "Book Store"
 msgstr "書店"
 
 #. item "Shops/Book Store"
-#: build/trans_presets.java:2572
+#: build/trans_presets.java:2565
 msgid "Edit Book Store"
 msgstr "編輯書店"
 
-#: build/trans_presets.java:2577
+#: build/trans_presets.java:2570
 msgid "Travel Agency"
 msgstr "旅行社"
 
 #. item "Shops/Travel Agency"
-#: build/trans_presets.java:2578
+#: build/trans_presets.java:2571
 msgid "Edit Travel Agency"
 msgstr "編輯旅行社"
 
+#: build/trans_presets.java:2576
+msgid "Butcher"
+msgstr "肉類"
+
+#. item "Shops/Butcher"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
+#: build/trans_presets.java:2578
+msgid "Edit Butcher"
+msgstr "編輯肉店"
+
 #: build/trans_presets.java:2583
+msgid "Baker"
+msgstr "麵包類"
+
+#. item "Shops/Baker"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
+#: build/trans_presets.java:2585
+msgid "Edit Baker"
+msgstr "編輯麵包店"
+
+#: build/trans_presets.java:2590
+msgid "Florist"
+msgstr "花類"
+
+#. item "Shops/Florist"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
+#: build/trans_presets.java:2592
+msgid "Edit Florist"
+msgstr "編輯花店"
+
+#: build/trans_presets.java:2597
+msgid "Organic"
+msgstr "有機產品"
+
+#. item "Shops/Organic"
+#: build/trans_presets.java:2598
+msgid "Edit Organic Shop"
+msgstr "編輯有機產品商店"
+
+#: build/trans_presets.java:2603
+msgid "Alcohol"
+msgstr "酒類"
+
+#. item "Shops/Alcohol"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
+#: build/trans_presets.java:2605
+msgid "Edit Alcohol Shop"
+msgstr "編輯賣酒的商店"
+
+#: build/trans_presets.java:2610
+msgid "Beverages"
+msgstr "飲料類"
+
+#. item "Shops/Beverages"
+#: build/trans_presets.java:2611
+msgid "Edit Beverages Shop"
+msgstr "編輯飲料店"
+
+#: build/trans_presets.java:2616
+msgid "Computer"
+msgstr "電腦類"
+
+#. item "Shops/Computer"
+#: build/trans_presets.java:2617
+msgid "Edit Computer Shop"
+msgstr "編輯電腦商店"
+
+#: build/trans_presets.java:2622
+msgid "Electronics"
+msgstr "電子材料"
+
+#. item "Shops/Electronics"
+#: build/trans_presets.java:2623
+msgid "Edit Electronics Shop"
+msgstr "編輯電子材料行"
+
+#: build/trans_presets.java:2628
+msgid "Hifi"
+msgstr "Hifi"
+
+#. item "Shops/Hifi"
+#: build/trans_presets.java:2629
+msgid "Edit Hifi Shop"
+msgstr "編輯 Hifi 音響店"
+
+#: build/trans_presets.java:2634
+msgid "Furniture"
+msgstr "傢俱類"
+
+#. item "Shops/Furniture"
+#: build/trans_presets.java:2635
+msgid "Edit Furniture Shop"
+msgstr "編輯傢俱店"
+
+#: build/trans_presets.java:2640
+msgid "Garden Centre"
+msgstr "園藝中心"
+
+#. item "Shops/Garden Centre"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
+#: build/trans_presets.java:2642
+msgid "Edit Garden Centre"
+msgstr "編輯園藝中心"
+
+#: build/trans_presets.java:2647
+msgid "Hardware"
+msgstr ""
+
+#. item "Shops/Hardware"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
+#: build/trans_presets.java:2649
+msgid "Edit Hardware Store"
+msgstr ""
+
+#: build/trans_presets.java:2654
+msgid "Do-it-yourself-store"
+msgstr "DIY 商店"
+
+#. item "Shops/Do-it-yourself-store"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
+#: build/trans_presets.java:2656
+msgid "Edit Do-it-yourself-store"
+msgstr "編輯 DIY 商店"
+
+#: build/trans_presets.java:2661
+msgid "Stationery"
+msgstr "文具類"
+
+#. item "Shops/Stationery"
+#: build/trans_presets.java:2662
+msgid "Edit Stationery Shop"
+msgstr "編輯文具店"
+
+#: build/trans_presets.java:2667
+msgid "Hairdresser"
+msgstr "美髮類"
+
+#. item "Shops/Hairdresser"
+#: build/trans_presets.java:2668
+msgid "Edit Hairdresser"
+msgstr "編輯美髮店"
+
+#: build/trans_presets.java:2673
+msgid "Shoes"
+msgstr "鞋類"
+
+#. item "Shops/Shoes"
+#: build/trans_presets.java:2674
+msgid "Edit Shoe Shop"
+msgstr "編輯鞋店"
+
+#: build/trans_presets.java:2679
+msgid "Toys"
+msgstr "玩具類"
+
+#. item "Shops/Toys"
+#: build/trans_presets.java:2680
+msgid "Edit Toy Shop"
+msgstr "編輯玩具店"
+
+#: build/trans_presets.java:2685
+msgid "Video"
+msgstr "影片類"
+
+#. item "Shops/Video"
+#: build/trans_presets.java:2686
+msgid "Edit Video Shop"
+msgstr "編輯影片類商店"
+
+#: build/trans_presets.java:2691
+msgid "Dry Cleaning"
+msgstr "乾洗類"
+
+#. item "Shops/Dry Cleaning"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
+#: build/trans_presets.java:2693
+msgid "Edit Dry Cleaning"
+msgstr "編輯乾洗店"
+
+#: build/trans_presets.java:2698
+msgid "Laundry"
+msgstr "洗衣店"
+
+#. item "Shops/Laundry"
+#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
+#: build/trans_presets.java:2700
+msgid "Edit Laundry"
+msgstr "編輯洗衣店"
+
+#: build/trans_presets.java:2705
+msgid "Outdoor"
+msgstr "戶外用品"
+
+#. item "Shops/Outdoor"
+#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
+#: build/trans_presets.java:2707
+msgid "Edit Outdoor Shop"
+msgstr "編輯戶外用品店"
+
+#. item "Shops/Sports"
+#: build/trans_presets.java:2713
+msgid "Edit Sports Shop"
+msgstr "編輯運動用品店"
+
+#: build/trans_presets.java:2718
+msgid "Optician"
+msgstr "眼鏡類"
+
+#. item "Shops/Optician"
+#: build/trans_presets.java:2719
+msgid "Edit Optician"
+msgstr "編輯眼鏡行"
+
+#. <separator/>
+#: build/trans_presets.java:2725
 msgid "Vending machine"
 msgstr "自動販賣機"
@@ -26306,5 +26457,5 @@
 #. item "Shops/Vending machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=vending_machine" />
-#: build/trans_presets.java:2585
+#: build/trans_presets.java:2727
 msgid "Edit Vending machine"
 msgstr "編輯自動販賣機"
@@ -26312,306 +26463,98 @@
 #. item "Shops/Vending machine" label "Edit Vending machine"
 #. <key key="amenity" value="vending_machine" />
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "Vending products"
 msgstr "販賣產品"
 
 #. item "Shops/Vending machine" combo "Vending products"
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "public_transport_plans"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "parking_tickets"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "food"
 msgstr "食物"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "drinks"
 msgstr "飲料"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "sweets"
 msgstr "甜點"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "cigarettes"
 msgstr "菸"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "photos"
 msgstr "相片"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "animal_food"
 msgstr "飼料"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "news_papers"
 msgstr "報紙"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "toys"
 msgstr "玩具"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "stamps"
 msgstr "郵票"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "SIM-cards"
 msgstr "SIM-卡"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "telephone_vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "vouchers"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
+#, fuzzy
+msgid "bicycle_tube"
+msgstr "單車"
+
+#: build/trans_presets.java:2729
 msgid "condoms"
 msgstr "保險套"
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "tampons"
 msgstr ""
 
-#: build/trans_presets.java:2587
+#: build/trans_presets.java:2729
 msgid "excrement_bags"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Credit cards"
-#: build/trans_presets.java:2596
+#: build/trans_presets.java:2738
 msgid "Account or loyalty cards"
 msgstr ""
 
 #. item "Shops/Vending machine" check "Account or loyalty cards"
-#: build/trans_presets.java:2598
-msgid "Butcher"
-msgstr "肉類"
-
-#. item "Shops/Butcher"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=butcher" />
-#: build/trans_presets.java:2600
-msgid "Edit Butcher"
-msgstr "編輯肉店"
-
-#: build/trans_presets.java:2605
-msgid "Baker"
-msgstr "麵包類"
-
-#. item "Shops/Baker"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=bakery" />
-#: build/trans_presets.java:2607
-msgid "Edit Baker"
-msgstr "編輯麵包店"
-
-#: build/trans_presets.java:2612
-msgid "Florist"
-msgstr "花類"
-
-#. item "Shops/Florist"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=florist" />
-#: build/trans_presets.java:2614
-msgid "Edit Florist"
-msgstr "編輯花店"
-
-#: build/trans_presets.java:2619
-msgid "Organic"
-msgstr "有機產品"
-
-#. item "Shops/Organic"
-#: build/trans_presets.java:2620
-msgid "Edit Organic Shop"
-msgstr "編輯有機產品商店"
-
-#: build/trans_presets.java:2625
-msgid "Alcohol"
-msgstr "酒類"
-
-#. item "Shops/Alcohol"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=alcohol" />
-#: build/trans_presets.java:2627
-msgid "Edit Alcohol Shop"
-msgstr "編輯賣酒的商店"
-
-#: build/trans_presets.java:2632
-msgid "Beverages"
-msgstr "飲料類"
-
-#. item "Shops/Beverages"
-#: build/trans_presets.java:2633
-msgid "Edit Beverages Shop"
-msgstr "編輯飲料店"
-
-#: build/trans_presets.java:2638
-msgid "Computer"
-msgstr "電腦類"
-
-#. item "Shops/Computer"
-#: build/trans_presets.java:2639
-msgid "Edit Computer Shop"
-msgstr "編輯電腦商店"
-
-#: build/trans_presets.java:2644
-msgid "Electronics"
-msgstr "電子材料"
-
-#. item "Shops/Electronics"
-#: build/trans_presets.java:2645
-msgid "Edit Electronics Shop"
-msgstr "編輯電子材料行"
-
-#: build/trans_presets.java:2650
-msgid "Hifi"
-msgstr "Hifi"
-
-#. item "Shops/Hifi"
-#: build/trans_presets.java:2651
-msgid "Edit Hifi Shop"
-msgstr "編輯 Hifi 音響店"
-
-#: build/trans_presets.java:2656
-msgid "Furniture"
-msgstr "傢俱類"
-
-#. item "Shops/Furniture"
-#: build/trans_presets.java:2657
-msgid "Edit Furniture Shop"
-msgstr "編輯傢俱店"
-
-#: build/trans_presets.java:2662
-msgid "Garden Centre"
-msgstr "園藝中心"
-
-#. item "Shops/Garden Centre"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=garden_centre" />
-#: build/trans_presets.java:2664
-msgid "Edit Garden Centre"
-msgstr "編輯園藝中心"
-
-#: build/trans_presets.java:2669
-msgid "Hardware"
-msgstr ""
-
-#. item "Shops/Hardware"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=hardware" />
-#: build/trans_presets.java:2671
-msgid "Edit Hardware Store"
-msgstr ""
-
-#: build/trans_presets.java:2676
-msgid "Do-it-yourself-store"
-msgstr "DIY 商店"
-
-#. item "Shops/Do-it-yourself-store"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=doityourself" />
-#: build/trans_presets.java:2678
-msgid "Edit Do-it-yourself-store"
-msgstr "編輯 DIY 商店"
-
-#: build/trans_presets.java:2683
-msgid "Stationery"
-msgstr "文具類"
-
-#. item "Shops/Stationery"
-#: build/trans_presets.java:2684
-msgid "Edit Stationery Shop"
-msgstr "編輯文具店"
-
-#: build/trans_presets.java:2689
-msgid "Hairdresser"
-msgstr "美髮類"
-
-#. item "Shops/Hairdresser"
-#: build/trans_presets.java:2690
-msgid "Edit Hairdresser"
-msgstr "編輯美髮店"
-
-#: build/trans_presets.java:2695
-msgid "Shoes"
-msgstr "鞋類"
-
-#. item "Shops/Shoes"
-#: build/trans_presets.java:2696
-msgid "Edit Shoe Shop"
-msgstr "編輯鞋店"
-
-#: build/trans_presets.java:2701
-msgid "Toys"
-msgstr "玩具類"
-
-#. item "Shops/Toys"
-#: build/trans_presets.java:2702
-msgid "Edit Toy Shop"
-msgstr "編輯玩具店"
-
-#: build/trans_presets.java:2707
-msgid "Video"
-msgstr "影片類"
-
-#. item "Shops/Video"
-#: build/trans_presets.java:2708
-msgid "Edit Video Shop"
-msgstr "編輯影片類商店"
-
-#: build/trans_presets.java:2713
-msgid "Dry Cleaning"
-msgstr "乾洗類"
-
-#. item "Shops/Dry Cleaning"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=dry_cleaning" />
-#: build/trans_presets.java:2715
-msgid "Edit Dry Cleaning"
-msgstr "編輯乾洗店"
-
-#: build/trans_presets.java:2720
-msgid "Laundry"
-msgstr "洗衣店"
-
-#. item "Shops/Laundry"
-#. <link href="http://wiki.openstreetmap.org/wiki/Proposed_features/Laundry" />
-#: build/trans_presets.java:2722
-msgid "Edit Laundry"
-msgstr "編輯洗衣店"
-
-#: build/trans_presets.java:2727
-msgid "Outdoor"
-msgstr "戶外用品"
-
-#. item "Shops/Outdoor"
-#. <link href="http://wiki.openstreetmap.org/wiki/Tag:shop=outdoor" />
-#: build/trans_presets.java:2729
-msgid "Edit Outdoor Shop"
-msgstr "編輯戶外用品店"
-
-#. item "Shops/Sports"
-#: build/trans_presets.java:2735
-msgid "Edit Sports Shop"
-msgstr "編輯運動用品店"
-
-#: build/trans_presets.java:2740
-msgid "Optician"
-msgstr "眼鏡類"
-
-#. item "Shops/Optician"
 #: build/trans_presets.java:2741
-msgid "Edit Optician"
-msgstr "編輯眼鏡行"
-
-#: build/trans_presets.java:2748
 msgid "Cash"
 msgstr "現金"
 
 #. group "Cash"
-#: build/trans_presets.java:2749
+#: build/trans_presets.java:2742
 msgid "Bank"
 msgstr "銀行"
@@ -26619,14 +26562,14 @@
 #. item "Cash/Bank"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bank" />
-#: build/trans_presets.java:2751
+#: build/trans_presets.java:2744
 msgid "Edit Bank"
 msgstr "編輯銀行"
 
-#: build/trans_presets.java:2756 build/trans_presets.java:2765
+#: build/trans_presets.java:2749 build/trans_presets.java:2758
 msgid "Automated Teller Machine"
 msgstr "自動提款機(ATM)"
 
 #. item "Cash/Bank" check "Automated Teller Machine"
-#: build/trans_presets.java:2758
+#: build/trans_presets.java:2751
 msgid "Money Exchange"
 msgstr ""
@@ -26634,5 +26577,5 @@
 #. item "Cash/Money Exchange"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=bureau_de_change" />
-#: build/trans_presets.java:2760
+#: build/trans_presets.java:2753
 msgid "Edit Money Exchange"
 msgstr ""
@@ -26640,15 +26583,15 @@
 #. item "Cash/Automated Teller Machine"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=atm" />
-#: build/trans_presets.java:2767
+#: build/trans_presets.java:2760
 msgid "Edit Automated Teller Machine"
 msgstr "編輯自動提款機"
 
 #. item "Cash/Automated Teller Machine" text "Operator"
-#: build/trans_presets.java:2772
+#: build/trans_presets.java:2765
 msgid "Health"
 msgstr "健康"
 
 #. group "Health"
-#: build/trans_presets.java:2773
+#: build/trans_presets.java:2766
 msgid "Doctors"
 msgstr "醫師"
@@ -26656,18 +26599,18 @@
 #. item "Health/Doctors"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=doctors" />
-#: build/trans_presets.java:2775
+#: build/trans_presets.java:2768
 msgid "Edit Doctors"
 msgstr "編輯醫師"
 
-#: build/trans_presets.java:2780
+#: build/trans_presets.java:2773
 msgid "Dentist"
 msgstr "牙醫"
 
 #. item "Health/Dentist"
-#: build/trans_presets.java:2781
+#: build/trans_presets.java:2774
 msgid "Edit Dentist"
 msgstr "編輯牙醫"
 
-#: build/trans_presets.java:2786
+#: build/trans_presets.java:2779
 msgid "Pharmacy"
 msgstr "藥局"
@@ -26675,5 +26618,5 @@
 #. item "Health/Pharmacy"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=pharmacy" />
-#: build/trans_presets.java:2788
+#: build/trans_presets.java:2781
 msgid "Edit Pharmacy"
 msgstr "編輯藥局"
@@ -26681,9 +26624,9 @@
 #. item "Health/Pharmacy" label "Edit Pharmacy"
 #. <key key="amenity" value="pharmacy" />
-#: build/trans_presets.java:2790
+#: build/trans_presets.java:2783
 msgid "Dispensing"
 msgstr "配藥"
 
-#: build/trans_presets.java:2794
+#: build/trans_presets.java:2787
 msgid "Hospital"
 msgstr "醫院"
@@ -26691,10 +26634,10 @@
 #. item "Health/Hospital"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=hospital" />
-#: build/trans_presets.java:2796
+#: build/trans_presets.java:2789
 msgid "Edit Hospital"
 msgstr "編輯醫院"
 
 #. item "Health/Hospital" text "Name"
-#: build/trans_presets.java:2800
+#: build/trans_presets.java:2793
 msgid "Emergency Access Point"
 msgstr ""
@@ -26703,5 +26646,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:highway=emergency_access_point"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:highway=emergency_access_point" />
-#: build/trans_presets.java:2803
+#: build/trans_presets.java:2796
 msgid "Edit Emergency Access Point"
 msgstr ""
@@ -26710,20 +26653,20 @@
 #. <space />
 #. <key key="highway" value="emergency_access_point" />
-#: build/trans_presets.java:2806
+#: build/trans_presets.java:2799
 msgid "Point Number"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Point Number"
-#: build/trans_presets.java:2807
+#: build/trans_presets.java:2800
 msgid "Point Name"
 msgstr ""
 
 #. item "Health/Emergency Access Point" text "Operator"
-#: build/trans_presets.java:2809
+#: build/trans_presets.java:2802
 msgid "Phone Number"
 msgstr "電話號碼"
 
 #. item "Health/Emergency Access Point" text "Phone Number"
-#: build/trans_presets.java:2810
+#: build/trans_presets.java:2803
 msgid "(Use international code, like +12-345-67890)"
 msgstr "(使用國際碼，像是 +12-345-67890)"
@@ -26731,5 +26674,5 @@
 #. item "Health/Emergency Access Point" label "(Use international code, like +12-345-67890)"
 #. <space />
-#: build/trans_presets.java:2813
+#: build/trans_presets.java:2806
 msgid "Veterinary"
 msgstr "獸醫"
@@ -26738,64 +26681,64 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=veterinary"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:amenity=veterinary" />
-#: build/trans_presets.java:2816
+#: build/trans_presets.java:2809
 msgid "Edit Veterinary"
 msgstr "編輯獸醫"
 
-#: build/trans_presets.java:2823
+#: build/trans_presets.java:2816
 msgid "Geography"
 msgstr "地理學"
 
 #. group "Geography"
-#: build/trans_presets.java:2824
+#: build/trans_presets.java:2817
 msgid "Places"
 msgstr "地名"
 
 #. group "Geography/Places"
+#: build/trans_presets.java:2818
+msgid "Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent"
+#: build/trans_presets.java:2819
+msgid "Edit Continent"
+msgstr ""
+
+#. item "Geography/Places/Continent" text "Name"
+#: build/trans_presets.java:2824
+msgid "Country"
+msgstr ""
+
+#. item "Geography/Places/Country"
 #: build/trans_presets.java:2825
-msgid "Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent"
-#: build/trans_presets.java:2826
-msgid "Edit Continent"
-msgstr ""
-
-#. item "Geography/Places/Continent" text "Name"
+msgid "Edit Country"
+msgstr ""
+
+#. item "Geography/Places/Country" text "Name"
+#: build/trans_presets.java:2830
+msgid "State"
+msgstr ""
+
+#. item "Geography/Places/State"
 #: build/trans_presets.java:2831
-msgid "Country"
-msgstr ""
-
-#. item "Geography/Places/Country"
-#: build/trans_presets.java:2832
-msgid "Edit Country"
-msgstr ""
-
-#. item "Geography/Places/Country" text "Name"
+msgid "Edit State"
+msgstr ""
+
+#. item "Geography/Places/State" text "Name"
+#: build/trans_presets.java:2836
+msgid "Region"
+msgstr ""
+
+#. item "Geography/Places/Region"
 #: build/trans_presets.java:2837
-msgid "State"
-msgstr ""
-
-#. item "Geography/Places/State"
-#: build/trans_presets.java:2838
-msgid "Edit State"
-msgstr ""
-
-#. item "Geography/Places/State" text "Name"
-#: build/trans_presets.java:2843
-msgid "Region"
-msgstr ""
-
-#. item "Geography/Places/Region"
-#: build/trans_presets.java:2844
 msgid "Edit Region"
 msgstr ""
 
 #. item "Geography/Places/Region" text "Name"
-#: build/trans_presets.java:2849
+#: build/trans_presets.java:2842
 msgid "County"
 msgstr "縣"
 
 #. item "Geography/Places/County"
-#: build/trans_presets.java:2850
+#: build/trans_presets.java:2843
 msgid "Edit County"
 msgstr "編輯縣"
@@ -26803,15 +26746,15 @@
 #. item "Geography/Places/County" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2856
+#: build/trans_presets.java:2849
 msgid "City"
 msgstr "市"
 
 #. item "Geography/Places/City"
-#: build/trans_presets.java:2857
+#: build/trans_presets.java:2850
 msgid "Edit City"
 msgstr "編輯市"
 
 #. item "Geography/Places/City" text "Name"
-#: build/trans_presets.java:2862
+#: build/trans_presets.java:2855
 msgid "Town"
 msgstr "鄉/鎮"
@@ -26819,10 +26762,10 @@
 #. item "Geography/Places/Town"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=town" />
-#: build/trans_presets.java:2864
+#: build/trans_presets.java:2857
 msgid "Edit Town"
 msgstr "編輯鄉/鎮"
 
 #. item "Geography/Places/Town" text "Name"
-#: build/trans_presets.java:2869
+#: build/trans_presets.java:2862
 msgid "Suburb"
 msgstr "郊區"
@@ -26830,25 +26773,25 @@
 #. item "Geography/Places/Suburb"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=suburb" />
-#: build/trans_presets.java:2871
+#: build/trans_presets.java:2864
 msgid "Edit Suburb"
 msgstr "編輯郊區"
 
 #. item "Geography/Places/Suburb" text "Name"
-#: build/trans_presets.java:2876
+#: build/trans_presets.java:2869
 msgid "Village"
 msgstr "村/里"
 
 #. item "Geography/Places/Village"
-#: build/trans_presets.java:2877
+#: build/trans_presets.java:2870
 msgid "Edit Village"
 msgstr "編輯村/里"
 
 #. item "Geography/Places/Village" text "Name"
-#: build/trans_presets.java:2882
+#: build/trans_presets.java:2875
 msgid "Hamlet"
 msgstr ""
 
 #. item "Geography/Places/Hamlet"
-#: build/trans_presets.java:2883
+#: build/trans_presets.java:2876
 msgid "Edit Hamlet"
 msgstr ""
@@ -26856,5 +26799,5 @@
 #. item "Geography/Places/Hamlet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2889
+#: build/trans_presets.java:2882
 msgid "Locality"
 msgstr ""
@@ -26862,10 +26805,10 @@
 #. item "Geography/Places/Locality"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=locality" />
-#: build/trans_presets.java:2891
+#: build/trans_presets.java:2884
 msgid "Edit Locality"
 msgstr ""
 
 #. item "Geography/Places/Locality" text "Name"
-#: build/trans_presets.java:2896
+#: build/trans_presets.java:2889
 msgid "Island"
 msgstr "島嶼"
@@ -26873,10 +26816,10 @@
 #. item "Geography/Places/Island"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=island" />
-#: build/trans_presets.java:2898
+#: build/trans_presets.java:2891
 msgid "Edit Island"
 msgstr "編輯島嶼"
 
 #. item "Geography/Places/Island" text "Name"
-#: build/trans_presets.java:2903
+#: build/trans_presets.java:2896
 msgid "Islet"
 msgstr ""
@@ -26884,5 +26827,5 @@
 #. item "Geography/Places/Islet"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:place=islet" />
-#: build/trans_presets.java:2905
+#: build/trans_presets.java:2898
 msgid "Edit Islet"
 msgstr ""
@@ -26890,5 +26833,5 @@
 #. item "Geography/Places/Islet" text "Name"
 #. <separator/>
-#: build/trans_presets.java:2911
+#: build/trans_presets.java:2904
 msgid "Cave Entrance"
 msgstr "洞窟入口"
@@ -26896,10 +26839,10 @@
 #. item "Geography/Places/Cave Entrance"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=cave_entrance" />
-#: build/trans_presets.java:2913
+#: build/trans_presets.java:2906
 msgid "Edit Cave Entrance"
 msgstr "編輯洞窟入口"
 
 #. item "Geography/Places/Cave Entrance" text "Name"
-#: build/trans_presets.java:2917
+#: build/trans_presets.java:2910
 msgid "Peak"
 msgstr "峰"
@@ -26907,10 +26850,10 @@
 #. item "Geography/Places/Peak"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=peak" />
-#: build/trans_presets.java:2919
+#: build/trans_presets.java:2912
 msgid "Edit Peak"
 msgstr "編輯山峰"
 
 #. item "Geography/Places/Peak" text "Elevation"
-#: build/trans_presets.java:2924
+#: build/trans_presets.java:2917
 msgid "Glacier"
 msgstr "冰河"
@@ -26918,10 +26861,10 @@
 #. item "Geography/Places/Glacier"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=glacier" />
-#: build/trans_presets.java:2926
+#: build/trans_presets.java:2919
 msgid "Edit Glacier"
 msgstr "編輯冰河"
 
 #. item "Geography/Places/Glacier" text "Elevation"
-#: build/trans_presets.java:2931
+#: build/trans_presets.java:2924
 msgid "Volcano"
 msgstr "火山"
@@ -26929,70 +26872,70 @@
 #. item "Geography/Places/Volcano"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=volcano" />
-#: build/trans_presets.java:2933
+#: build/trans_presets.java:2926
 msgid "Edit Volcano"
 msgstr "編輯火山"
 
 #. item "Geography/Places/Volcano" text "Elevation"
-#: build/trans_presets.java:2939
+#: build/trans_presets.java:2932
 msgid "Boundaries"
 msgstr "邊界"
 
 #. group "Boundaries"
-#: build/trans_presets.java:2940
+#: build/trans_presets.java:2933
 msgid "National"
 msgstr "國界"
 
 #. item "Boundaries/National"
-#: build/trans_presets.java:2941
+#: build/trans_presets.java:2934
 msgid "Edit National Boundary"
 msgstr "編輯國界"
 
 #. item "Boundaries/National" text "Name"
-#: build/trans_presets.java:2946
+#: build/trans_presets.java:2939
 msgid "Administrative"
 msgstr "行政區"
 
 #. item "Boundaries/Administrative"
-#: build/trans_presets.java:2947
+#: build/trans_presets.java:2940
 msgid "Edit Administrative Boundary"
 msgstr "編輯行政區邊界"
 
 #. item "Boundaries/Administrative" text "Name"
-#: build/trans_presets.java:2952
+#: build/trans_presets.java:2945
 msgid "Civil"
 msgstr "城市的"
 
 #. item "Boundaries/Civil"
-#: build/trans_presets.java:2953
+#: build/trans_presets.java:2946
 msgid "Edit Civil Boundary"
 msgstr "編輯城市邊界"
 
 #. item "Boundaries/Civil" text "Name"
-#: build/trans_presets.java:2958
+#: build/trans_presets.java:2951
 msgid "Political"
 msgstr "政治的"
 
 #. item "Boundaries/Political"
-#: build/trans_presets.java:2959
+#: build/trans_presets.java:2952
 msgid "Edit Political Boundary"
 msgstr "編輯政治的邊界"
 
 #. item "Boundaries/Political" text "Name"
-#: build/trans_presets.java:2964
+#: build/trans_presets.java:2957
 msgid "National park"
 msgstr "國家公園"
 
 #. item "Boundaries/National park"
-#: build/trans_presets.java:2965
+#: build/trans_presets.java:2958
 msgid "Edit National Park Boundary"
 msgstr "編輯國家公園"
 
 #. item "Boundaries/National park" text "Name"
-#: build/trans_presets.java:2971
+#: build/trans_presets.java:2964
 msgid "Land use"
 msgstr "土地利用"
 
 #. group "Land use"
-#: build/trans_presets.java:2972
+#: build/trans_presets.java:2965
 msgid "Tree"
 msgstr "樹"
@@ -27001,15 +26944,15 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=tree"
 #. fi.href="http://wiki.openstreetmap.org/wiki/Fi:Tag:natural=tree"  />
-#: build/trans_presets.java:2975
+#: build/trans_presets.java:2968
 msgid "Edit Tree"
 msgstr "編輯樹"
 
 #. item "Land use/Tree" text "Height"
-#: build/trans_presets.java:2980
+#: build/trans_presets.java:2973
 msgid "Botanical Name"
 msgstr "植物學名"
 
 #. item "Land use/Tree" text "Botanical Name"
-#: build/trans_presets.java:2982
+#: build/trans_presets.java:2975
 msgid "Wood"
 msgstr ""
@@ -27018,5 +26961,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=wood"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:natural=wood" />
-#: build/trans_presets.java:2985
+#: build/trans_presets.java:2978
 msgid "Edit Wood"
 msgstr ""
@@ -27024,17 +26967,17 @@
 #. item "Land use/Wood" combo "Type"
 #. item "Land use/Forest" combo "Type"
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "coniferous"
 msgstr "松類"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "deciduous"
 msgstr "落葉類"
 
-#: build/trans_presets.java:2988 build/trans_presets.java:2997
+#: build/trans_presets.java:2981 build/trans_presets.java:2990
 msgid "mixed"
 msgstr "混合"
 
-#: build/trans_presets.java:2990
+#: build/trans_presets.java:2983
 msgid "Forest"
 msgstr "森林"
@@ -27043,14 +26986,14 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=forest"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=forest" />
-#: build/trans_presets.java:2993
+#: build/trans_presets.java:2986
 msgid "Edit Forest Landuse"
 msgstr "編輯森林土地利用"
 
-#: build/trans_presets.java:2999
+#: build/trans_presets.java:2992
 msgid "Nature Reserve"
 msgstr "自然保育"
 
 #. item "Land use/Nature Reserve"
-#: build/trans_presets.java:3000
+#: build/trans_presets.java:2993
 msgid "Edit Nature Reserve"
 msgstr "編輯自然保育"
@@ -27058,25 +27001,25 @@
 #. item "Land use/Nature Reserve" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3005
+#: build/trans_presets.java:2998
 msgid "Scree"
 msgstr ""
 
 #. item "Land use/Scree"
-#: build/trans_presets.java:3006
+#: build/trans_presets.java:2999
 msgid "Edit Scree"
 msgstr ""
 
 #. item "Land use/Scree" text "Name"
-#: build/trans_presets.java:3010
+#: build/trans_presets.java:3003
 msgid "Scrub"
 msgstr ""
 
 #. item "Land use/Scrub"
-#: build/trans_presets.java:3011
+#: build/trans_presets.java:3004
 msgid "Edit Scrub"
 msgstr ""
 
 #. item "Land use/Scrub" text "Name"
-#: build/trans_presets.java:3015
+#: build/trans_presets.java:3008
 msgid "Fell"
 msgstr ""
@@ -27084,10 +27027,10 @@
 #. item "Land use/Fell"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=fell" />
-#: build/trans_presets.java:3017
+#: build/trans_presets.java:3010
 msgid "Edit Fell"
 msgstr ""
 
 #. item "Land use/Fell" text "Name"
-#: build/trans_presets.java:3021
+#: build/trans_presets.java:3014
 msgid "Heath"
 msgstr ""
@@ -27095,5 +27038,5 @@
 #. item "Land use/Heath"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:natural=heath" />
-#: build/trans_presets.java:3023
+#: build/trans_presets.java:3016
 msgid "Edit Heath"
 msgstr ""
@@ -27101,5 +27044,5 @@
 #. item "Land use/Heath" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3028
+#: build/trans_presets.java:3021
 msgid "Farmyard"
 msgstr ""
@@ -27108,45 +27051,45 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=farmyard"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:landuse=farmyard" />
-#: build/trans_presets.java:3031
+#: build/trans_presets.java:3024
 msgid "Edit Farmyard Landuse"
 msgstr ""
 
 #. item "Land use/Farmyard" text "Name"
+#: build/trans_presets.java:3029
+msgid "Farmland"
+msgstr ""
+
+#. item "Land use/Farmland"
+#: build/trans_presets.java:3030
+msgid "Edit Farmland Landuse"
+msgstr ""
+
+#. item "Land use/Farmland" text "Name"
+#: build/trans_presets.java:3035
+msgid "Meadow"
+msgstr ""
+
+#. item "Land use/Meadow"
 #: build/trans_presets.java:3036
-msgid "Farmland"
-msgstr ""
-
-#. item "Land use/Farmland"
-#: build/trans_presets.java:3037
-msgid "Edit Farmland Landuse"
-msgstr ""
-
-#. item "Land use/Farmland" text "Name"
+msgid "Edit Meadow Landuse"
+msgstr ""
+
+#. item "Land use/Meadow" text "Name"
+#: build/trans_presets.java:3041
+msgid "Vineyard"
+msgstr ""
+
+#. item "Land use/Vineyard"
 #: build/trans_presets.java:3042
-msgid "Meadow"
-msgstr ""
-
-#. item "Land use/Meadow"
-#: build/trans_presets.java:3043
-msgid "Edit Meadow Landuse"
-msgstr ""
-
-#. item "Land use/Meadow" text "Name"
+msgid "Edit Vineyard Landuse"
+msgstr ""
+
+#. item "Land use/Vineyard" text "Name"
+#: build/trans_presets.java:3047
+msgid "Allotments"
+msgstr ""
+
+#. item "Land use/Allotments"
 #: build/trans_presets.java:3048
-msgid "Vineyard"
-msgstr ""
-
-#. item "Land use/Vineyard"
-#: build/trans_presets.java:3049
-msgid "Edit Vineyard Landuse"
-msgstr ""
-
-#. item "Land use/Vineyard" text "Name"
-#: build/trans_presets.java:3054
-msgid "Allotments"
-msgstr ""
-
-#. item "Land use/Allotments"
-#: build/trans_presets.java:3055
 msgid "Edit Allotments Landuse"
 msgstr ""
@@ -27154,25 +27097,25 @@
 #. item "Land use/Allotments" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3061
+#: build/trans_presets.java:3054
 msgid "Garden"
 msgstr "花園"
 
 #. item "Land use/Garden"
-#: build/trans_presets.java:3062
+#: build/trans_presets.java:3055
 msgid "Edit Garden"
 msgstr "編輯花園"
 
 #. item "Land use/Garden" text "Name"
-#: build/trans_presets.java:3066
+#: build/trans_presets.java:3059
 msgid "Grass"
 msgstr "草地"
 
 #. item "Land use/Grass"
-#: build/trans_presets.java:3067
+#: build/trans_presets.java:3060
 msgid "Edit Grass Landuse"
 msgstr ""
 
 #. item "Land use/Grass" text "Name"
-#: build/trans_presets.java:3072
+#: build/trans_presets.java:3065
 msgid "Village Green"
 msgstr ""
@@ -27180,10 +27123,10 @@
 #. item "Land use/Village Green"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=village_green" />
-#: build/trans_presets.java:3074
+#: build/trans_presets.java:3067
 msgid "Edit Village Green Landuse"
 msgstr ""
 
 #. item "Land use/Village Green" text "Name"
-#: build/trans_presets.java:3079
+#: build/trans_presets.java:3072
 msgid "Common"
 msgstr ""
@@ -27191,20 +27134,20 @@
 #. item "Land use/Common"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:leisure=common" />
-#: build/trans_presets.java:3081
+#: build/trans_presets.java:3074
 msgid "Edit Common"
 msgstr ""
 
 #. item "Land use/Common" text "Name"
-#: build/trans_presets.java:3085
+#: build/trans_presets.java:3078
 msgid "Park"
 msgstr "公園"
 
 #. item "Land use/Park"
-#: build/trans_presets.java:3086
+#: build/trans_presets.java:3079
 msgid "Edit Park"
 msgstr "編輯公園"
 
 #. item "Land use/Park" text "Name"
-#: build/trans_presets.java:3090
+#: build/trans_presets.java:3083
 msgid "Recreation Ground"
 msgstr ""
@@ -27212,5 +27155,5 @@
 #. item "Land use/Recreation Ground"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=recreation_ground" />
-#: build/trans_presets.java:3092
+#: build/trans_presets.java:3085
 msgid "Edit Recreation Ground Landuse"
 msgstr ""
@@ -27218,15 +27161,15 @@
 #. item "Land use/Recreation Ground" text "Name"
 #. <separator/>
-#: build/trans_presets.java:3098
+#: build/trans_presets.java:3091
 msgid "Residential area"
 msgstr ""
 
 #. item "Land use/Residential area"
-#: build/trans_presets.java:3099
+#: build/trans_presets.java:3092
 msgid "Edit Residential Landuse"
 msgstr ""
 
 #. item "Land use/Residential area" text "Name"
-#: build/trans_presets.java:3104
+#: build/trans_presets.java:3097
 msgid "Graveyard"
 msgstr ""
@@ -27234,9 +27177,9 @@
 #. item "Land use/Graveyard"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=grave_yard" />
-#: build/trans_presets.java:3106
+#: build/trans_presets.java:3099
 msgid "Edit Graveyard"
 msgstr ""
 
-#: build/trans_presets.java:3112
+#: build/trans_presets.java:3105
 msgid "Cemetery"
 msgstr ""
@@ -27244,39 +27187,39 @@
 #. item "Land use/Cemetery"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=cemetery" />
+#: build/trans_presets.java:3107
+msgid "Edit Cemetery Landuse"
+msgstr ""
+
 #: build/trans_presets.java:3114
-msgid "Edit Cemetery Landuse"
-msgstr ""
-
+msgid "Retail"
+msgstr ""
+
+#. item "Land use/Retail"
+#: build/trans_presets.java:3115
+msgid "Edit Retail Landuse"
+msgstr ""
+
+#. item "Land use/Retail" text "Name"
+#: build/trans_presets.java:3120
+msgid "Commercial"
+msgstr ""
+
+#. item "Land use/Commercial"
 #: build/trans_presets.java:3121
-msgid "Retail"
-msgstr ""
-
-#. item "Land use/Retail"
-#: build/trans_presets.java:3122
-msgid "Edit Retail Landuse"
-msgstr ""
-
-#. item "Land use/Retail" text "Name"
-#: build/trans_presets.java:3127
-msgid "Commercial"
-msgstr ""
-
-#. item "Land use/Commercial"
-#: build/trans_presets.java:3128
 msgid "Edit Commercial Landuse"
 msgstr ""
 
 #. item "Land use/Commercial" text "Name"
-#: build/trans_presets.java:3133
+#: build/trans_presets.java:3126
 msgid "Industrial"
 msgstr "工業區"
 
 #. item "Land use/Industrial"
-#: build/trans_presets.java:3134
+#: build/trans_presets.java:3127
 msgid "Edit Industrial Landuse"
 msgstr ""
 
 #. item "Land use/Industrial" text "Name"
-#: build/trans_presets.java:3139
+#: build/trans_presets.java:3132
 msgid "Railway land"
 msgstr ""
@@ -27284,15 +27227,15 @@
 #. item "Land use/Railway land"
 #. <link href="http://wiki.openstreetmap.org/wiki/Tag:landuse=railway" />
-#: build/trans_presets.java:3141
+#: build/trans_presets.java:3134
 msgid "Edit Railway Landuse"
 msgstr ""
 
 #. item "Land use/Railway land" text "Name"
-#: build/trans_presets.java:3146
+#: build/trans_presets.java:3139
 msgid "Military"
 msgstr ""
 
 #. item "Land use/Military"
-#: build/trans_presets.java:3147
+#: build/trans_presets.java:3140
 msgid "Edit Military Landuse"
 msgstr ""
@@ -27300,50 +27243,50 @@
 #. item "Land use/Military" text "Name"
 #. <separator/>
+#: build/trans_presets.java:3146
+msgid "Construction area"
+msgstr ""
+
+#. item "Land use/Construction area"
+#: build/trans_presets.java:3147
+msgid "Edit Construction Landuse"
+msgstr ""
+
+#. item "Land use/Construction area" text "Name"
+#: build/trans_presets.java:3152
+msgid "Brownfield"
+msgstr ""
+
+#. item "Land use/Brownfield"
 #: build/trans_presets.java:3153
-msgid "Construction area"
-msgstr ""
-
-#. item "Land use/Construction area"
-#: build/trans_presets.java:3154
-msgid "Edit Construction Landuse"
-msgstr ""
-
-#. item "Land use/Construction area" text "Name"
+msgid "Edit Brownfield Landuse"
+msgstr ""
+
+#. item "Land use/Brownfield" text "Name"
+#: build/trans_presets.java:3158
+msgid "Greenfield"
+msgstr ""
+
+#. item "Land use/Greenfield"
 #: build/trans_presets.java:3159
-msgid "Brownfield"
-msgstr ""
-
-#. item "Land use/Brownfield"
-#: build/trans_presets.java:3160
-msgid "Edit Brownfield Landuse"
-msgstr ""
-
-#. item "Land use/Brownfield" text "Name"
+msgid "Edit Greenfield Landuse"
+msgstr ""
+
+#. item "Land use/Greenfield" text "Name"
+#: build/trans_presets.java:3164
+msgid "Landfill"
+msgstr ""
+
+#. item "Land use/Landfill"
 #: build/trans_presets.java:3165
-msgid "Greenfield"
-msgstr ""
-
-#. item "Land use/Greenfield"
-#: build/trans_presets.java:3166
-msgid "Edit Greenfield Landuse"
-msgstr ""
-
-#. item "Land use/Greenfield" text "Name"
+msgid "Edit Landfill Landuse"
+msgstr ""
+
+#. item "Land use/Landfill" text "Name"
+#: build/trans_presets.java:3170
+msgid "Quarry"
+msgstr ""
+
+#. item "Land use/Quarry"
 #: build/trans_presets.java:3171
-msgid "Landfill"
-msgstr ""
-
-#. item "Land use/Landfill"
-#: build/trans_presets.java:3172
-msgid "Edit Landfill Landuse"
-msgstr ""
-
-#. item "Land use/Landfill" text "Name"
-#: build/trans_presets.java:3177
-msgid "Quarry"
-msgstr ""
-
-#. item "Land use/Quarry"
-#: build/trans_presets.java:3178
 msgid "Edit Quarry Landuse"
 msgstr ""
@@ -27353,5 +27296,5 @@
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:multipolygon"
 #. fr.href="http://wiki.openstreetmap.org/wiki/FR:Relation:multipolygon" />
-#: build/trans_presets.java:3191
+#: build/trans_presets.java:3184
 msgid "Edit Multipolygon"
 msgstr ""
@@ -27360,10 +27303,10 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3197
+#: build/trans_presets.java:3190
 msgid "outer segment"
 msgstr ""
 
 #. item "Relations/Multipolygon" role "outer segment"
-#: build/trans_presets.java:3198
+#: build/trans_presets.java:3191
 msgid "inner segment"
 msgstr ""
@@ -27371,5 +27314,5 @@
 #. item "Relations/Multipolygon" role "inner segment"
 #. </roles>
-#: build/trans_presets.java:3201
+#: build/trans_presets.java:3194
 msgid "Turn restriction"
 msgstr ""
@@ -27378,5 +27321,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:restriction"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:restriction"/>
-#: build/trans_presets.java:3204
+#: build/trans_presets.java:3197
 msgid "Edit Turn Restriction"
 msgstr ""
@@ -27384,34 +27327,34 @@
 #. item "Relations/Turn restriction" label "Edit Turn Restriction"
 #. <key key="type" value="restriction" />
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "Restriction"
 msgstr ""
 
 #. item "Relations/Turn restriction" combo "Restriction"
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_straight_on"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "no_u_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_right_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_left_turn"
 msgstr ""
 
-#: build/trans_presets.java:3206
+#: build/trans_presets.java:3199
 msgid "only_straight_on"
 msgstr ""
@@ -27420,15 +27363,15 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3211
+#: build/trans_presets.java:3204
 msgid "from way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "from way"
-#: build/trans_presets.java:3212
+#: build/trans_presets.java:3205
 msgid "via node or way"
 msgstr ""
 
 #. item "Relations/Turn restriction" role "via node or way"
-#: build/trans_presets.java:3213
+#: build/trans_presets.java:3206
 msgid "to way"
 msgstr ""
@@ -27436,5 +27379,5 @@
 #. item "Relations/Turn restriction" role "to way"
 #. </roles>
-#: build/trans_presets.java:3216
+#: build/trans_presets.java:3209
 msgid "Route"
 msgstr ""
@@ -27443,5 +27386,5 @@
 #. <link href="http://wiki.openstreetmap.org/wiki/Relation:route"
 #. de.href="http://wiki.openstreetmap.org/wiki/DE:Relation:route"/>
-#: build/trans_presets.java:3219
+#: build/trans_presets.java:3212
 msgid "Edit Route"
 msgstr ""
@@ -27449,5 +27392,5 @@
 #. item "Relations/Route" label "Edit Route"
 #. <key key="type" value="route" />
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "Route type"
 msgstr ""
@@ -27538,5 +27481,5 @@
 #. <rule>
 #. <condition k="cycleway" v="opposite"/>
-#: build/trans_presets.java:3221 build/trans_style.java:233
+#: build/trans_presets.java:3214 build/trans_style.java:233
 #: build/trans_style.java:689 build/trans_style.java:715
 #: build/trans_style.java:732 build/trans_style.java:909
@@ -27546,17 +27489,17 @@
 msgstr "單車"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "bus"
 msgstr "公車"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "road"
 msgstr "道路"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ferry"
 msgstr "渡輪"
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "ski"
 msgstr ""
@@ -27616,5 +27559,5 @@
 #. <rule>
 #. <condition k="highway" v="steps"/>
-#: build/trans_presets.java:3221 build/trans_style.java:247
+#: build/trans_presets.java:3214 build/trans_style.java:247
 #: build/trans_style.java:697 build/trans_style.java:705
 #: build/trans_style.java:723 build/trans_style.java:739
@@ -27623,9 +27566,9 @@
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "tram"
 msgstr ""
 
-#: build/trans_presets.java:3221
+#: build/trans_presets.java:3214
 msgid "detour"
 msgstr ""
@@ -27639,10 +27582,10 @@
 #. <rule>
 #. <condition k="railway" v="subway"/>
-#: build/trans_presets.java:3221 build/trans_style.java:1208
+#: build/trans_presets.java:3214 build/trans_style.java:1208
 msgid "subway"
 msgstr ""
 
 #. item "Relations/Route" text "Reference"
-#: build/trans_presets.java:3224
+#: build/trans_presets.java:3217
 msgid "Symbol description"
 msgstr ""
@@ -27650,31 +27593,31 @@
 #. item "Relations/Route" text "Description"
 #. <optional>
-#: build/trans_presets.java:3227
+#: build/trans_presets.java:3220
 msgid "Network"
 msgstr "網路"
 
 #. item "Relations/Route" text "Operator"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "Route state"
 msgstr ""
 
 #. item "Relations/Route" combo "Route state"
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "proposed"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "alternate"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "temporary"
 msgstr ""
 
-#: build/trans_presets.java:3229
+#: build/trans_presets.java:3222
 msgid "connection"
 msgstr ""
 
-#: build/trans_presets.java:3230
+#: build/trans_presets.java:3223
 msgid "Color (hex)"
 msgstr ""
@@ -27683,31 +27626,106 @@
 #. </optional>
 #. <roles>
-#: build/trans_presets.java:3233
+#: build/trans_presets.java:3226
 msgid "route segment"
 msgstr ""
 
 #. item "Relations/Route" role "route segment"
-#: build/trans_presets.java:3234
+#: build/trans_presets.java:3227
 msgid "forward segment"
 msgstr ""
 
 #. item "Relations/Route" role "forward segment"
-#: build/trans_presets.java:3235
+#: build/trans_presets.java:3228
 msgid "backward segment"
 msgstr ""
 
 #. item "Relations/Route" role "backward segment"
-#: build/trans_presets.java:3236
+#: build/trans_presets.java:3229
 msgid "halt point"
 msgstr ""
 
 #. item "Relations/Route" role "halt point"
-#: build/trans_presets.java:3237
+#: build/trans_presets.java:3230
 msgid "forward halt point"
 msgstr ""
 
 #. item "Relations/Route" role "forward halt point"
-#: build/trans_presets.java:3238
+#: build/trans_presets.java:3231
 msgid "backward halt point"
+msgstr ""
+
+#. <!--
+#. A little help:
+#. 1. every rule starts with <rule> and ends with </rule>
+#. 2. every rule needs a condition
+#. -k for the key (required)
+#. -v for the value as a string
+#. -b for the values yes / no (boolean, will also understand true, 1 and false, 0 respectively)
+#. Both -v and -b are optional (but recommended). If both are ommitted, the rule will apply to all
+#. tags with the given key - don't forget to set a priority if other rules could also apply.
+#. 3. line attributes
+#. - width absolute width in pixel in every zoom level
+#. - realwidth relative width which will be scaled in meters, integer
+#. - colour
+#. - priority
+#. - dashed x - dashed line, length of dashes / spaces in x pixels
+#. - dashed x,y - dashed line, x length of dashes / spaces in y pixels
+#. - dashedcolour second (background) colour of a dashed line
+#. 4. linemod attributes
+#. - all line attributes
+#. - mode ('over' or 'under')
+#. - width can be specified relative to modified way:
+#. +x - <x> pixels are added to way size
+#. -x - <x> pixels are subtracted from way size
+#. x% - the size is <x> percent of modified way
+#. If the size is <= 1 the minimum size of 1 is used.
+#. 5. area attributes
+#. - colour
+#. - priority
+#. - closed (true or false - when true the area style is ignored for unclosed ways)
+#. 6. icon attributes
+#. - icon (path to icon)
+#. - relative to the icon path
+#. - URL's are also supported to allow remote icons (are cached locally)
+#. - priority
+#. - annonate (true or false)
+#. 7. scale_min / scale_max
+#. - zoom scale for display
+#.
+#. Using both area and line attributes for the same key/value pair does work. For areas
+#. first the best matching area rule is searched and the best matching line rule is
+#. connected with it. They need not have the same key/value pair.
+#.
+#. The colours can consist of the two components - name and hex code (e.g. water#0000ff).
+#. If both are given, the color name is introduced in preferences with that value. If only
+#. code is given (e.g. #0000ff), it is used directly. If only name is given, either user
+#. modified preferences or previous value is used. The 6 hex digit color code can also
+#. be appended by a hex value of the alpha channel (thus having 8 hex digits instead of 6).
+#.
+#. Linemod's are drawn over or under the line they are associated with and modify the
+#. appearance. There can be multiple linemod's for one way (contrary to line styles,
+#. where only one applies). When drawn over a way either a very small width must be choosen
+#. or an alpha value must be used for the colour field (otherwise the original way is
+#. not visible). When the mod is under the way, then it must be wide enough to be visible
+#. on the sides of the way or the waystyles itself must use alpha channel (which may
+#. look strange).
+#.
+#. If a key/value pair matches more than one rule, the "rule that wins" is unpredicted
+#. in case they have same priority! Using priority settings helps to solve conflicts.
+#.
+#. For external files the <rules> should have following elements:
+#. - author           the author of the style
+#. - version          a version number of some sort (e.g. creation date)
+#. - description      what is your style meant to be
+#. - shortdescription very short description
+#. - link             a link to a helpful website (optional)
+#. - The fields description, shortdescription and link may also be localized (e.g. de.link)
+#. - name             is the name of the style
+#. - when the style replaces the whole rendering choose a new name
+#. - when the style is additional choose "standard" or don't use name tag
+#. -->
+#.
+#: build/trans_style.java:72
+msgid "standard"
 msgstr ""
 
